@algosail/tree-sitter 0.1.5 → 0.1.7

package/grammar.js

@@ -1,6 +1,8 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
+const { builtinWords } = require('@algosail/builtins')
+
 module.exports = grammar({
   name: 'sail',
 
@@ -57,6 +59,8 @@ module.exports = grammar({
     module_group_ref: ($) => /~[A-Z][a-zA-Z0-9_]*&[A-Z][a-zA-Z0-9_]*/,
     // ~Module#Tag
     module_tag_ref: ($) => /~[A-Z][a-zA-Z0-9_]*#[A-Z][a-zA-Z0-9_]*/,
+    // ~Module#Tag
+    module_tag_pattern: ($) => /~[A-Z][a-zA-Z0-9_]*\_[A-Z][a-zA-Z0-9_]*/,
     // ~Module$Map
     module_map_ref: ($) => /~[A-Z][a-zA-Z0-9_]*\$[A-Z][a-zA-Z0-9_]*/,
     // ~Module$Map.field
@@ -77,10 +81,10 @@ module.exports = grammar({
     effect_remove: ($) => /\-[A-Z][a-zA-Z0-9_]*/,
 
     // :name
-    slot_push: ($) => /:[a-z][a-zA-Z0-9_]*/,
+    slot_write: ($) => /:[a-z][a-zA-Z0-9_]*/,
 
     // ;name
-    slot_pop: ($) => /;[a-z][a-zA-Z0-9_]*/,
+    slot_read: ($) => /;[a-z][a-zA-Z0-9_]*/,
 
     // 'raw string literal'
     raw_string: ($) => /\'[^\']*\'/,
@@ -180,11 +184,12 @@ module.exports = grammar({
         $.tag_ref,
         $.module_tag_ref,
         $.tag_pattern,
+        $.module_tag_pattern,
         $.default_pattern,
         $.field_ref,
         $.module_field_ref,
-        $.slot_push,
-        $.slot_pop,
+        $.slot_write,
+        $.slot_read,
         $.raw_string,
         $.raw_value,
       ),
@@ -194,31 +199,6 @@ module.exports = grammar({
 
     // All-caps stack-manipulation and control-flow builtins.
     // Listed as a single token() so they take priority over $.identifier.
-    builtin_word: ($) =>
-      token(
-        choice(
-          'DUP',
-          'SWAP',
-          'DROP',
-          'OVER',
-          'ROT',
-          'ROTR',
-          'NIP',
-          'TUCK',
-          'DUP2',
-          'DROP2',
-          'SWAP2',
-          'CALL',
-          'MATCH',
-          'COMPOSE',
-          'IF',
-          'MAP',
-          'GETL',
-          'SETL',
-          'UPDL',
-          'APP',
-          'ERROR',
-        ),
-      ),
+    builtin_word: ($) => token(choice(...Object.keys(builtinWords))),
   },
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algosail/tree-sitter",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Tree-sitter grammar for the Sail language",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -39,5 +39,8 @@
     "queries/*",
     "src/**",
     "*.wasm"
-  ]
+  ],
+  "dependencies": {
+    "@algosail/builtins": "^0.0.1"
+  }
 }

package/src/grammar.json

@@ -101,6 +101,10 @@
       "type": "PATTERN",
       "value": "~[A-Z][a-zA-Z0-9_]*#[A-Z][a-zA-Z0-9_]*"
     },
+    "module_tag_pattern": {
+      "type": "PATTERN",
+      "value": "~[A-Z][a-zA-Z0-9_]*\\_[A-Z][a-zA-Z0-9_]*"
+    },
     "module_map_ref": {
       "type": "PATTERN",
       "value": "~[A-Z][a-zA-Z0-9_]*\\$[A-Z][a-zA-Z0-9_]*"
@@ -133,11 +137,11 @@
       "type": "PATTERN",
       "value": "\\-[A-Z][a-zA-Z0-9_]*"
     },
-    "slot_push": {
+    "slot_write": {
       "type": "PATTERN",
       "value": ":[a-z][a-zA-Z0-9_]*"
     },
-    "slot_pop": {
+    "slot_read": {
       "type": "PATTERN",
       "value": ";[a-z][a-zA-Z0-9_]*"
     },
@@ -704,6 +708,10 @@
           "type": "SYMBOL",
           "name": "tag_pattern"
         },
+        {
+          "type": "SYMBOL",
+          "name": "module_tag_pattern"
+        },
         {
           "type": "SYMBOL",
           "name": "default_pattern"
@@ -718,11 +726,11 @@
         },
         {
           "type": "SYMBOL",
-          "name": "slot_push"
+          "name": "slot_write"
         },
         {
           "type": "SYMBOL",
-          "name": "slot_pop"
+          "name": "slot_read"
         },
         {
           "type": "SYMBOL",
@@ -814,34 +822,6 @@
           {
             "type": "STRING",
             "value": "COMPOSE"
-          },
-          {
-            "type": "STRING",
-            "value": "IF"
-          },
-          {
-            "type": "STRING",
-            "value": "MAP"
-          },
-          {
-            "type": "STRING",
-            "value": "GETL"
-          },
-          {
-            "type": "STRING",
-            "value": "SETL"
-          },
-          {
-            "type": "STRING",
-            "value": "UPDL"
-          },
-          {
-            "type": "STRING",
-            "value": "APP"
-          },
-          {
-            "type": "STRING",
-            "value": "ERROR"
           }
         ]
       }

package/src/node-types.json

@@ -279,6 +279,10 @@
           "type": "module_field_ref",
           "named": true
         },
+        {
+          "type": "module_tag_pattern",
+          "named": true
+        },
         {
           "type": "module_tag_ref",
           "named": true
@@ -300,11 +304,11 @@
           "named": true
         },
         {
-          "type": "slot_pop",
+          "type": "slot_read",
           "named": true
         },
         {
-          "type": "slot_push",
+          "type": "slot_write",
           "named": true
         },
         {
@@ -589,6 +593,10 @@
             "type": "module_field_ref",
             "named": true
           },
+          {
+            "type": "module_tag_pattern",
+            "named": true
+          },
           {
             "type": "module_tag_ref",
             "named": true
@@ -610,11 +618,11 @@
             "named": true
           },
           {
-            "type": "slot_pop",
+            "type": "slot_read",
             "named": true
           },
           {
-            "type": "slot_push",
+            "type": "slot_write",
             "named": true
           },
           {
@@ -711,6 +719,10 @@
     "type": "module_map_ref",
     "named": true
   },
+  {
+    "type": "module_tag_pattern",
+    "named": true
+  },
   {
     "type": "module_tag_ref",
     "named": true
@@ -736,11 +748,11 @@
     "named": true
   },
   {
-    "type": "slot_pop",
+    "type": "slot_read",
     "named": true
   },
   {
-    "type": "slot_push",
+    "type": "slot_write",
     "named": true
   },
   {