parser: parse integer constants + allow constant inside include

usagi-coffee · Jan 26, 2024 · d22a13b · d22a13b
1 parent 04f83a1
commit d22a13b
Show file tree

Hide file tree

Showing 4 changed files with 53,748 additions and 53,267 deletions.
diff --git a/grammar.js b/grammar.js
@@ -40,7 +40,8 @@ module.exports = grammar({
 
     file_name: ($) => /[A-z-_|0-9|\/]+\.[i]/i,
     comment: ($) => seq("/*", /[^*]*\*+([^/*][^*]*\*+)*/, "/"),
-    constant: ($) => seq("{", "&", $.identifier, "}"),
+    constant: ($) =>
+      seq("{", optional("&"), choice($.identifier, $._integer_literal), "}"),
 
     identifier: ($) => /[A-z_]{1}[A-z-_|0-9]*/i,
     qualified_name: ($) =>
@@ -180,7 +181,8 @@ module.exports = grammar({
           field("value", $._expression)
         ),
         field("name", $.identifier),
-        field("value", $.double_quoted_string)
+        field("value", $.double_quoted_string),
+        $.constant
       ),
     include: ($) =>
       seq("{", $.file_name, optional(repeat($.include_argument)), "}"),

diff --git a/src/grammar.json b/src/grammar.json
@@ -45,12 +45,29 @@
           "value": "{"
         },
         {
-          "type": "STRING",
-          "value": "&"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "&"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         },
         {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "identifier"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "_integer_literal"
+            }
+          ]
         },
         {
           "type": "STRING",
@@ -1081,6 +1098,10 @@
             "type": "SYMBOL",
             "name": "double_quoted_string"
           }
+        },
+        {
+          "type": "SYMBOL",
+          "name": "constant"
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -804,7 +804,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "identifier",
@@ -1570,6 +1570,16 @@
           }
         ]
       }
+    },
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "constant",
+          "named": true
+        }
+      ]
     }
   },
   {