fix string literals; trim trailing whitespace

2021-06-14 23:33:28 +02:00
parent 9606c5fa49
commit 01a4a981da
12 changed files with 3239 additions and 3142 deletions
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -1015,8 +1015,33 @@
      ]
    },
    "string_lit": {
-      "type": "SYMBOL",
-      "name": "quoted_template"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_template_char"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "escape_sequence"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
    },
    "quoted_template": {
      "type": "SEQ",
@@ -1176,6 +1201,10 @@
    ],
    [
      "conditional"
+    ],
+    [
+      "string_lit",
+      "quoted_template"
    ]
  ],
  "precedences": [],