fix: escape sequence literals

lys-lang · Oct 29, 2022 · 8e637c2 · 8e637c2
1 parent 3b4b06d
commit 8e637c2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -8,13 +8,13 @@ build:
 	node dist/utils/packStdLib.js
 
 GREP="."
-TEST_FILE=*
+TEST_FILE="test/*.spec.ts"
 
 DEBUG_TYPES=0
 
 just-test:
 	DEBUG_TYPES=$(DEBUG_TYPES) \
-		node ./node_modules/mocha/bin/_mocha --grep "$(GREP)" "test/$(TEST_FILE).spec.ts"
+		node ./node_modules/mocha/bin/_mocha --grep "$(GREP)" $(TEST_FILE)
 
 test: | build just-test
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "@webassemblyjs/wast-printer": "1.11.1",
     "arg": "^4.1.3",
     "binaryen": "^100.0.0",
-    "ebnf": "^1.7.4",
+    "ebnf": "^1.9.0",
     "wabt": "^1.0.30"
   },
   "devDependencies": {

diff --git a/src/grammar.ts b/src/grammar.ts
@@ -183,7 +183,7 @@ PostfixNumber     ::= (HexLiteral | NumberLiteral) Reference? {pin=1,simplifyWhe
 NumberLiteral     ::= !('0x') ("0" | [1-9] [0-9]*) ("." [0-9]+)? (("e" | "E") ( "-" | "+" )? ("0" | [1-9] [0-9]*))? {pin=2}
 NegNumberLiteral  ::= '-'? NumberLiteral {pin=2}
 HexLiteral        ::= "0x" [0-9A-Fa-f]+ {pin=1}
-StringLiteral     ::= STRING_DELIMITER ((![\\\\"] [#x20-#xFFFF])* | ('\\' (STRING_DELIMITER | '\\' | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HEXDIG HEXDIG HEXDIG HEXDIG)?))* STRING_DELIMITER {pin=1}
+StringLiteral     ::= STRING_DELIMITER ((![\\\\"] [#x20-#xFFFF])* | ([#x5c] (STRING_DELIMITER | [#x5c] | '/' | 'b' | 'f' | 'n' | 'r' | 't' | 'u' HEXDIG HEXDIG HEXDIG HEXDIG)?))* STRING_DELIMITER {pin=1}
 Literal           ::= StringLiteral
                     | PostfixNumber
                     | BooleanLiteral {fragment=true}

diff --git a/test/Canonical.spec.ts b/test/Canonical.spec.ts
@@ -65,6 +65,8 @@ describe('Canonical', function() {
   test`var a: Number = 0x0`;
   test`var a: Number = 0x1facbeda0192830190238019283`;
   test`var a: Number = -0x1facbeda0192830190238019283`;
+  test`var a = "\\u001B[2J"`;
+  test`var b = "\\u001b[H\\u001b[2J\\u001b[3J"`;
   test`var a = false`;
 
   test`

diff --git a/test/Parser.spec.ts b/test/Parser.spec.ts
@@ -689,6 +689,13 @@ describe('Parser', () => {
       testLiteral(JSON.stringify('A string'));
       testLiteral(JSON.stringify("asdasd`\"`'''`\\\""));
       testLiteral(JSON.stringify(213422342344234));
+      testLiteral(JSON.stringify("\\u001B[2J"));
+      testLiteral(JSON.stringify("\\u001b[H\\u001b[2J\\u001b[3J"));
+
+      test`
+        var a = "\\u001B[2J"
+        var b = "\\u001b[H\\u001b[2J\\u001b[3J"
+      `;
 
       test`
         var a = 1