Update tree-sitter version

binding.gyp

@@ -8,7 +8,7 @@
       ],
       "sources": [
         "src/parser.c",
-        "src/binding.cc"
+        "bindings/node/binding.cc"
       ],
       "cflags_c": [
         "-std=c99",

bindings/node/index.js

@@ -0,0 +1,19 @@
+try {
+  module.exports = require("../../build/Release/tree_sitter_minizinc_binding");
+} catch (error1) {
+  if (error1.code !== 'MODULE_NOT_FOUND') {
+    throw error1;
+  }
+  try {
+    module.exports = require("../../build/Debug/tree_sitter_minizinc_binding");
+  } catch (error2) {
+    if (error2.code !== 'MODULE_NOT_FOUND') {
+      throw error2;
+    }
+    throw error1
+  }
+}
+
+try {
+  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+} catch (_) {}

index.js

@@ -1,13 +0,0 @@
-try {
-  module.exports = require("./build/Release/tree_sitter_minizinc_binding");
-} catch (error) {
-  try {
-    module.exports = require("./build/Debug/tree_sitter_minizinc_binding");
-  } catch (_) {
-    throw error;
-  }
-}
-
-try {
-  module.exports.nodeTypeInfo = require("./src/node-types.json");
-} catch (_) {}

package.json

@@ -2,7 +2,7 @@
   "name": "tree-sitter-minizinc",
   "version": "0.1.0",
   "description": "MiniZinc grammer for tree-sitter",
-  "main": "index.js",
+  "main": "bindings/node",
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",
     "test": "tree-sitter test"
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "prettier": "2.2.1",
-    "tree-sitter-cli": "^0.16.9"
+    "tree-sitter-cli": "^0.19.1"
   },
   "tree-sitter": [
     {

queries/highlights.scm

@@ -45,9 +45,9 @@
   "<->"
   "->"
   "<-"
-  "\/"
+  "\\/"
   "xor"
-  "/\"
+  "/\\"
   "="
   "=="
   "!="

src/grammar.json

@@ -2468,6 +2468,7 @@
       "assignment"
     ]
   ],
+  "precedences": [],
   "externals": [],
   "inline": [],
   "supertypes": [

src/node-types.json

@@ -1275,6 +1275,10 @@
     "type": "array",
     "named": false
   },
+  {
+    "type": "block_comment",
+    "named": true
+  },
   {
     "type": "bool",
     "named": false
@@ -1359,6 +1363,10 @@
     "type": "let",
     "named": false
   },
+  {
+    "type": "line_comment",
+    "named": true
+  },
   {
     "type": "maximize",
     "named": false

src/tree_sitter/parser.h

@@ -13,6 +13,8 @@ extern "C" {
 #define ts_builtin_sym_end 0
 #define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
 
+typedef uint16_t TSStateId;
+
 #ifndef TREE_SITTER_API_H_
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
@@ -30,11 +32,10 @@ typedef struct {
   uint16_t length;
 } TSFieldMapSlice;
 
-typedef uint16_t TSStateId;
-
 typedef struct {
-  bool visible : 1;
+  bool visible;
-  bool named : 1;
+  bool named;
+  bool supertype;
 } TSSymbolMetadata;
 
 typedef struct TSLexer TSLexer;
@@ -56,21 +57,21 @@ typedef enum {
   TSParseActionTypeRecover,
 } TSParseActionType;
 
-typedef struct {
+typedef union {
-  union {
+  struct {
-    struct {
+    uint8_t type;
-      TSStateId state;
+    TSStateId state;
-      bool extra : 1;
+    bool extra;
-      bool repetition : 1;
+    bool repetition;
-    } shift;
+  } shift;
-    struct {
+  struct {
-      TSSymbol symbol;
+    uint8_t type;
-      int16_t dynamic_precedence;
+    uint8_t child_count;
-      uint8_t child_count;
+    TSSymbol symbol;
-      uint8_t production_id;
+    int16_t dynamic_precedence;
-    } reduce;
+    uint16_t production_id;
-  } params;
+  } reduce;
-  TSParseActionType type : 4;
+  uint8_t type;
 } TSParseAction;
 
 typedef struct {
@@ -82,7 +83,7 @@ typedef union {
   TSParseAction action;
   struct {
     uint8_t count;
-    bool reusable : 1;
+    bool reusable;
   } entry;
 } TSParseActionEntry;
 
@@ -92,13 +93,24 @@ struct TSLanguage {
   uint32_t alias_count;
   uint32_t token_count;
   uint32_t external_token_count;
-  const char **symbol_names;
+  uint32_t state_count;
-  const TSSymbolMetadata *symbol_metadata;
+  uint32_t large_state_count;
-  const uint16_t *parse_table;
+  uint32_t production_id_count;
-  const TSParseActionEntry *parse_actions;
+  uint32_t field_count;
-  const TSLexMode *lex_modes;
-  const TSSymbol *alias_sequences;
   uint16_t max_alias_sequence_length;
+  const uint16_t *parse_table;
+  const uint16_t *small_parse_table;
+  const uint32_t *small_parse_table_map;
+  const TSParseActionEntry *parse_actions;
+  const char **symbol_names;
+  const char **field_names;
+  const TSFieldMapSlice *field_map_slices;
+  const TSFieldMapEntry *field_map_entries;
+  const TSSymbolMetadata *symbol_metadata;
+  const TSSymbol *public_symbol_map;
+  const uint16_t *alias_map;
+  const TSSymbol *alias_sequences;
+  const TSLexMode *lex_modes;
   bool (*lex_fn)(TSLexer *, TSStateId);
   bool (*keyword_lex_fn)(TSLexer *, TSStateId);
   TSSymbol keyword_capture_token;
@@ -111,14 +123,6 @@ struct TSLanguage {
     unsigned (*serialize)(void *, char *);
     void (*deserialize)(void *, const char *, unsigned);
   } external_scanner;
-  uint32_t field_count;
-  const TSFieldMapSlice *field_map_slices;
-  const TSFieldMapEntry *field_map_entries;
-  const char **field_names;
-  uint32_t large_state_count;
-  const uint16_t *small_parse_table;
-  const uint32_t *small_parse_table_map;
-  const TSSymbol *public_symbol_map;
 };
 
 /*
@@ -167,66 +171,50 @@ struct TSLanguage {
 
 #define ACTIONS(id) id
 
-#define SHIFT(state_value)                \
+#define SHIFT(state_value)            \
-  {                                       \
+  {{                                  \
-    {                                     \
+    .shift = {                        \
-      .params = {                         \
+      .type = TSParseActionTypeShift, \
-        .shift = {                        \
+      .state = state_value            \
-          .state = state_value            \
+    }                                 \
-        }                                 \
+  }}
-      },                                  \
-      .type = TSParseActionTypeShift      \
-    }                                     \
-  }
 
 #define SHIFT_REPEAT(state_value)     \
-  {                                   \
+  {{                                  \
-    {                                 \
+    .shift = {                        \
-      .params = {                     \
+      .type = TSParseActionTypeShift, \
-        .shift = {                    \
+      .state = state_value,           \
-          .state = state_value,       \
+      .repetition = true              \
-          .repetition = true          \
-        }                             \
-      },                              \
-      .type = TSParseActionTypeShift  \
     }                                 \
-  }
+  }}
-
-#define RECOVER()                        \
-  {                                      \
-    { .type = TSParseActionTypeRecover } \
-  }
 
 #define SHIFT_EXTRA()                 \
-  {                                   \
+  {{                                  \
-    {                                 \
+    .shift = {                        \
-      .params = {                     \
+      .type = TSParseActionTypeShift, \
-        .shift = {                    \
+      .extra = true                   \
-          .extra = true               \
-        }                             \
-      },                              \
-      .type = TSParseActionTypeShift  \
     }                                 \
-  }
+  }}
 
 #define REDUCE(symbol_val, child_count_val, ...) \
-  {                                              \
+  {{                                             \
-    {                                            \
+    .reduce = {                                  \
-      .params = {                                \
+      .type = TSParseActionTypeReduce,           \
-        .reduce = {                              \
+      .symbol = symbol_val,                      \
-          .symbol = symbol_val,                  \
+      .child_count = child_count_val,            \
-          .child_count = child_count_val,        \
+      __VA_ARGS__                                \
-          __VA_ARGS__                            \
+    },                                           \
-        },                                       \
+  }}
-      },                                         \
-      .type = TSParseActionTypeReduce            \
-    }                                            \
-  }
 
-#define ACCEPT_INPUT()                  \
+#define RECOVER()                    \
-  {                                     \
+  {{                                 \
-    { .type = TSParseActionTypeAccept } \
+    .type = TSParseActionTypeRecover \
-  }
+  }}
+
+#define ACCEPT_INPUT()              \
+  {{                                \
+    .type = TSParseActionTypeAccept \
+  }}
 
 #ifdef __cplusplus
 }