⬆️ tree-sitter-cli

package.json

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "prebuild": "^10.0.0",
-    "tree-sitter-cli": "^0.16.1"
+    "tree-sitter-cli": "^0.16.7"
   },
   "scripts": {
     "install": "prebuild-install || node-gyp rebuild",

src/node-types.json

@@ -2964,6 +2964,11 @@
       }
     }
   },
+  {
+    "type": "word",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "\n",
     "named": false
@@ -3200,6 +3205,10 @@
     "type": "fi",
     "named": false
   },
+  {
+    "type": "file_descriptor",
+    "named": true
+  },
   {
     "type": "for",
     "named": false
@@ -3208,6 +3217,10 @@
     "type": "function",
     "named": false
   },
+  {
+    "type": "heredoc_start",
+    "named": true
+  },
   {
     "type": "if",
     "named": false
@@ -3228,6 +3241,10 @@
     "type": "readonly",
     "named": false
   },
+  {
+    "type": "regex",
+    "named": true
+  },
   {
     "type": "special_variable_name",
     "named": true
@@ -3260,10 +3277,6 @@
     "type": "while",
     "named": false
   },
-  {
-    "type": "word",
-    "named": true
-  },
   {
     "type": "{",
     "named": false

src/tree_sitter/parser.h

@@ -62,13 +62,13 @@ typedef struct {
       TSStateId state;
       bool extra : 1;
       bool repetition : 1;
-    };
+    } shift;
     struct {
       TSSymbol symbol;
       int16_t dynamic_precedence;
       uint8_t child_count;
       uint8_t production_id;
-    };
+    } reduce;
   } params;
   TSParseActionType type : 4;
 } TSParseAction;
@@ -83,7 +83,7 @@ typedef union {
   struct {
     uint8_t count;
     bool reusable : 1;
-  };
+  } entry;
 } TSParseActionEntry;
 
 struct TSLanguage {
@@ -167,22 +167,28 @@ struct TSLanguage {
 
 #define ACTIONS(id) id
 
-#define SHIFT(state_value)              \
+#define SHIFT(state_value)                \
-  {                                     \
+  {                                       \
-    {                                   \
+    {                                     \
-      .type = TSParseActionTypeShift,   \
+      .params = {                         \
-      .params = {.state = state_value}, \
+        .shift = {                        \
-    }                                   \
+          .state = state_value            \
+        }                                 \
+      },                                  \
+      .type = TSParseActionTypeShift      \
+    }                                     \
   }
 
 #define SHIFT_REPEAT(state_value)     \
   {                                   \
     {                                 \
-      .type = TSParseActionTypeShift, \
       .params = {                     \
-        .state = state_value,         \
+        .shift = {                    \
-        .repetition = true            \
+          .state = state_value,       \
+          .repetition = true          \
+        }                             \
       },                              \
+      .type = TSParseActionTypeShift  \
     }                                 \
   }
 
@@ -194,20 +200,26 @@ struct TSLanguage {
 #define SHIFT_EXTRA()                 \
   {                                   \
     {                                 \
-      .type = TSParseActionTypeShift, \
+      .params = {                     \
-      .params = {.extra = true}       \
+        .shift = {                    \
+          .extra = true               \
+        }                             \
+      },                              \
+      .type = TSParseActionTypeShift  \
     }                                 \
   }
 
 #define REDUCE(symbol_val, child_count_val, ...) \
   {                                              \
     {                                            \
-      .type = TSParseActionTypeReduce,           \
       .params = {                                \
-        .symbol = symbol_val,                    \
+        .reduce = {                              \
-        .child_count = child_count_val,          \
+          .symbol = symbol_val,                  \
-        __VA_ARGS__                              \
+          .child_count = child_count_val,        \
-      }                                          \
+          __VA_ARGS__                            \
+        },                                       \
+      },                                         \
+      .type = TSParseActionTypeReduce            \
     }                                            \
   }