Merge pull request Wilfred#12 from gpanders/multiline-string-prefix

Include leading \\ characters as anonymous nodes
Andoryuuta · Apr 2, 2022 · 664ebbf · 664ebbf
2 parents 42e93d0 + 2761ae3
commit 664ebbf
Show file tree

Hide file tree

Showing 5 changed files with 74,127 additions and 73,729 deletions.
diff --git a/grammar.js b/grammar.js
@@ -118,8 +118,7 @@ const AMPERSAND = "&",
   dec_int = seq(dec, repeat(dec_)),
   hex_int = seq(hex, repeat(hex_)),
   unescaped_string_fragment = token.immediate(prec(1, /[^"\\\{\}]+/)),
-  unescaped_char_fragment = token.immediate(prec(1, /[^'\\]/)),
-  line_string = token(seq("\\\\", /[^\n]*/));
+  unescaped_char_fragment = token.immediate(prec(1, /[^'\\]/));
 
 module.exports = grammar({
   name: "zig",
@@ -843,9 +842,9 @@ module.exports = grammar({
         '"'
       ),
 
-    LINESTRING: (_) => repeat1(line_string),
+    LINESTRING: (_) => seq("\\\\", /[^\n]*/),
 
-    _STRINGLITERAL: ($) => choice($.STRINGLITERALSINGLE, $.LINESTRING),
+    _STRINGLITERAL: ($) => choice($.STRINGLITERALSINGLE, repeat1($.LINESTRING)),
 
     Variable: ($) => field("variable", $.IDENTIFIER),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -5288,23 +5288,17 @@
       ]
     },
     "LINESTRING": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "TOKEN",
-        "content": {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "\\\\"
-            },
-            {
-              "type": "PATTERN",
-              "value": "[^\\n]*"
-            }
-          ]
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\\\\"
+        },
+        {
+          "type": "PATTERN",
+          "value": "[^\\n]*"
         }
-      }
+      ]
     },
     "_STRINGLITERAL": {
       "type": "CHOICE",
@@ -5314,8 +5308,11 @@
           "name": "STRINGLITERALSINGLE"
         },
         {
-          "type": "SYMBOL",
-          "name": "LINESTRING"
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "LINESTRING"
+          }
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -3321,6 +3321,10 @@
     "type": "[",
     "named": false
   },
+  {
+    "type": "\\\\",
+    "named": false
+  },
   {
     "type": "]",
     "named": false