fix: new #pragma & $ in function names

Author: dvlkv

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+
+## [Unreleased]
+
+### Fixed
+- new types of #pragma
+- $ in the middle of function names
+
 ## [1.1.3] - 2023-03-21
 ### Fixed
 - $ in function and identifier names

grammar/func/grammar.js

@@ -31,9 +31,14 @@ module.exports = grammar({
     pragma_directive: $ => seq(
       '#pragma',
       repeat1(' '),
-      field('key', choice('version', 'not-version')), 
-      repeat1(' '),
-      field('value', $.version_identifier)
+      choice(
+        seq(
+          field('key', choice('version', 'not-version')), 
+          repeat1(' '),
+          field('value', $.version_identifier)
+        ),
+        field('key', choice('allow-post-modification', 'compute-asm-ltr')), 
+      ),
     ),
 
     global_var_declarations: $ => seq(

grammar/func/grammar/functions.js

@@ -14,7 +14,7 @@ module.exports = {
     )
   ),
 
-  function_name: $ => /(`.*`)|((\.|~)?(([$a-zA-Z_](\w|['?:])+)|([a-zA-Z])))/,
+  function_name: $ => /(`.*`)|((\.|~)?(([$a-zA-Z_](\w|['?:$])+)|([a-zA-Z$])))/,
 
   impure: $ => "impure",
   inline: $ => choice("inline", "inline_ref"),

grammar/func/src/grammar.json

@@ -95,36 +95,63 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "key",
-          "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "version"
-              },
-              {
-                "type": "STRING",
-                "value": "not-version"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "key",
+                  "content": {
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": "version"
+                      },
+                      {
+                        "type": "STRING",
+                        "value": "not-version"
+                      }
+                    ]
+                  }
+                },
+                {
+                  "type": "REPEAT1",
+                  "content": {
+                    "type": "STRING",
+                    "value": " "
+                  }
+                },
+                {
+                  "type": "FIELD",
+                  "name": "value",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "version_identifier"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "FIELD",
+              "name": "key",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "allow-post-modification"
+                  },
+                  {
+                    "type": "STRING",
+                    "value": "compute-asm-ltr"
+                  }
+                ]
               }
-            ]
-          }
-        },
-        {
-          "type": "REPEAT1",
-          "content": {
-            "type": "STRING",
-            "value": " "
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "value",
-          "content": {
-            "type": "SYMBOL",
-            "name": "version_identifier"
-          }
+            }
+          ]
         }
       ]
     },
@@ -1485,7 +1512,7 @@
     },
     "function_name": {
       "type": "PATTERN",
-      "value": "(`.*`)|((\\.|~)?(([$a-zA-Z_](\\w|['?:])+)|([a-zA-Z])))"
+      "value": "(`.*`)|((\\.|~)?(([$a-zA-Z_](\\w|['?:$])+)|([a-zA-Z$])))"
     },
     "impure": {
       "type": "STRING",

grammar/func/src/node-types.json

@@ -878,6 +878,14 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "allow-post-modification",
+            "named": false
+          },
+          {
+            "type": "compute-asm-ltr",
+            "named": false
+          },
           {
             "type": "not-version",
             "named": false
@@ -890,7 +898,7 @@
       },
       "value": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
             "type": "version_identifier",
@@ -1508,6 +1516,10 @@
     "type": "^>>=",
     "named": false
   },
+  {
+    "type": "allow-post-modification",
+    "named": false
+  },
   {
     "type": "asm",
     "named": false
@@ -1524,6 +1536,10 @@
     "type": "comment",
     "named": true
   },
+  {
+    "type": "compute-asm-ltr",
+    "named": false
+  },
   {
     "type": "const",
     "named": false