Merge pull request Wilfred#11 from mskelton/fix-nodes

Support `#include` directives in nodes
blmaier · Nov 21, 2023 · e876e2a · e876e2a
2 parents cc26cbf + 3fc8ed5
commit e876e2a
Show file tree

Hide file tree

Showing 5 changed files with 3,748 additions and 3,067 deletions.
diff --git a/grammar.js b/grammar.js
@@ -159,7 +159,10 @@ module.exports = grammar({
 				$.omit_if_no_ref,
 				$.labeled_item,
 				$.node,
-				$.property
+				$.property,
+				$.preproc_include,
+				$.preproc_def,
+				$.preproc_function_def
 			),
 
 		// TODO: is delete-node allowed at top level?
@@ -391,7 +394,10 @@ module.exports = grammar({
 });
 
 function preprocessor(command) {
-	return alias(new RegExp('#[ \t]*' + command), '#' + command);
+	return alias(
+		token(prec(2, new RegExp('#[ \t]*' + command))),
+		'#' + command
+	);
 }
 
 function commaSep(rule) {

diff --git a/src/grammar.json b/src/grammar.json
@@ -560,6 +560,18 @@
         {
           "type": "SYMBOL",
           "name": "property"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "preproc_include"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "preproc_def"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "preproc_function_def"
         }
       ]
     },
@@ -1828,8 +1840,15 @@
         {
           "type": "ALIAS",
           "content": {
-            "type": "PATTERN",
-            "value": "#[ \t]*include"
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 2,
+              "content": {
+                "type": "PATTERN",
+                "value": "#[ \t]*include"
+              }
+            }
           },
           "named": false,
           "value": "#include"
@@ -1867,8 +1886,15 @@
         {
           "type": "ALIAS",
           "content": {
-            "type": "PATTERN",
-            "value": "#[ \t]*define"
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 2,
+              "content": {
+                "type": "PATTERN",
+                "value": "#[ \t]*define"
+              }
+            }
           },
           "named": false,
           "value": "#define"
@@ -1909,8 +1935,15 @@
         {
           "type": "ALIAS",
           "content": {
-            "type": "PATTERN",
-            "value": "#[ \t]*define"
+            "type": "TOKEN",
+            "content": {
+              "type": "PREC",
+              "value": 2,
+              "content": {
+                "type": "PATTERN",
+                "value": "#[ \t]*define"
+              }
+            }
           },
           "named": false,
           "value": "#define"

diff --git a/src/node-types.json b/src/node-types.json
@@ -698,6 +698,18 @@
           "type": "omit_if_no_ref",
           "named": true
         },
+        {
+          "type": "preproc_def",
+          "named": true
+        },
+        {
+          "type": "preproc_function_def",
+          "named": true
+        },
+        {
+          "type": "preproc_include",
+          "named": true
+        },
         {
           "type": "property",
           "named": true