Merge pull request #77 from rycont/no-newline-in-string

Fix: raise error when newline in string

Author: rycont

core/deno.json

@@ -6,5 +6,5 @@
   },
   "name": "@dalbit-yaksok/core",
   "exports": "./mod.ts",
-  "version": "0.2.0-RC.9"
+  "version": "0.2.0"
 }

core/error/prepare.ts

@@ -76,6 +76,18 @@ export class UnexpectedCharError extends YaksokError<UnexpectedCharErrorResource
     }
 }
 
+export class UnexpectedNewlineError extends UnexpectedCharError {
+    constructor(props: { parts: string; position?: Position }) {
+        super({
+            resource: {
+                char: '줄바꿈',
+                parts: props.parts,
+            },
+        })
+        this.message = `${bold(blue(props.parts))}엔 줄바꿈을 사용할 수 없어요.`
+    }
+}
+
 export class UnexpectedEndOfCodeError extends YaksokError {
     constructor(props: {
         resource?: {

core/prepare/tokenize/index.ts

@@ -2,6 +2,7 @@ import { NotAcceptableSignal } from './signal.ts'
 import { RULES } from './rules.ts'
 
 import { TOKEN_TYPE, type Token } from './token.ts'
+import { YaksokError } from '../../error/common.ts'
 
 class Tokenizer {
     private tokens: Token[] = []
@@ -72,6 +73,15 @@ class Tokenizer {
                     if (e instanceof NotAcceptableSignal) {
                         continue
                     }
+
+                    if (e instanceof YaksokError && !e.tokens) {
+                        e.position = {
+                            column: columnCheckpoint,
+                            line: lineCheckpoint,
+                        }
+                    }
+
+                    throw e
                 }
             }
 

core/prepare/tokenize/rules.ts

@@ -1,5 +1,6 @@
 import { NotAcceptableSignal } from './signal.ts'
 import { Token, TOKEN_TYPE } from './token.ts'
+import { UnexpectedNewlineError } from '../../error/prepare.ts'
 
 const OPERATORS = [
     '+',
@@ -246,6 +247,12 @@ export const RULES: {
                     return value
                 }
 
+                if (view() === '\n') {
+                    throw new UnexpectedNewlineError({
+                        parts: '문자열',
+                    })
+                }
+
                 value += shift()!
             }
 

deno.json

@@ -22,7 +22,7 @@
         "test",
         "monaco-language-provider"
     ],
-    "version": "0.2.0-RC.9",
+    "version": "0.2.0",
     "tasks": {
         "apply-version": "deno run --allow-read --allow-write apply-version.ts",
         "publish": "deno task --recursive test && deno publish --allow-dirty"

monaco-language-provider/deno.json

@@ -4,5 +4,5 @@
   },
   "name": "@dalbit-yaksok/monaco-language-provider",
   "exports": "./mod.ts",
-  "version": "0.2.0-RC.9"
+  "version": "0.2.0"
 }

quickjs/deno.json

@@ -9,5 +9,5 @@
     "check-deploy": "deno publish --dry-run --allow-dirty",
     "test": "deno test --quiet --allow-net --allow-read --parallel & deno lint & deno task check-deploy"
   },
-  "version": "0.2.0-RC.9"
+  "version": "0.2.0"
 }

runtest.ts

@@ -8,14 +8,9 @@ import { yaksok } from '@dalbit-yaksok/core'
 
 await yaksok(
     `
-약속, 물어보기
-    결과: "성공"
-
-약속, (질문) 물어보기
-    결과: "이건 아님"
-
-(물어보기) + 물어보기 * 3 보여주기
-("뭐라도" 물어보기) + ("뭐라도" 물어보기) * 3 보여주기
+결과: "줄
+바꿈이
+나왔어요"
 `,
     // {
     //     runFFI(runtime, bodyCode, args) {

test/errors/unexpected-eol.test.ts

@@ -1,6 +1,9 @@
 import { assertIsError } from 'assert'
 import { yaksok } from '../../core/mod.ts'
-import { UnexpectedEndOfCodeError } from '../../core/error/index.ts'
+import {
+    UnexpectedEndOfCodeError,
+    UnexpectedNewlineError,
+} from '../../core/error/index.ts'
 
 Deno.test('예상치 못한 줄바꿈', async () => {
     try {
@@ -10,3 +13,15 @@ Deno.test('예상치 못한 줄바꿈', async () => {
         console.log(error)
     }
 })
+
+Deno.test('문자열 내 줄바꿈', async () => {
+    try {
+        await yaksok(`
+    "줄바꿈이
+    있는 문자열"
+        `)
+    } catch (error) {
+        assertIsError(error, UnexpectedNewlineError)
+        console.log(error)
+    }
+})