update genereted parser files

src/grammar.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://tree-sitter.github.io/tree-sitter/assets/schemas/grammar.schema.json",
   "name": "dotenv",
   "rules": {
     "document": {
@@ -293,5 +294,6 @@
     }
   ],
   "inline": [],
-  "supertypes": []
+  "supertypes": [],
+  "reserved": {}
 }

src/node-types.json

@@ -44,6 +44,7 @@
   {
     "type": "document",
     "named": true,
+    "root": true,
     "fields": {},
     "children": {
       "multiple": true,

src/parser.c

@@ -1,10 +1,12 @@
+/* Automatically @generated by tree-sitter */
+
 #include "tree_sitter/parser.h"
 
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 
-#define LANGUAGE_VERSION 14
+#define LANGUAGE_VERSION 15
 #define STATE_COUNT 32
 #define LARGE_STATE_COUNT 3
 #define SYMBOL_COUNT 28
@@ -13,7 +15,9 @@
 #define EXTERNAL_TOKEN_COUNT 1
 #define FIELD_COUNT 2
 #define MAX_ALIAS_SEQUENCE_LENGTH 4
+#define MAX_RESERVED_WORD_SET_SIZE 0
 #define PRODUCTION_ID_COUNT 3
+#define SUPERTYPE_COUNT 0
 
 enum ts_symbol_identifiers {
   anon_sym_EQ = 1,
@@ -233,7 +237,7 @@ static const char * const ts_field_names[] = {
   [field_value] = "value",
 };
 
-static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
+static const TSMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = {
   [1] = {.index = 0, .length = 1},
   [2] = {.index = 1, .length = 2},
 };
@@ -633,7 +637,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
   }
 }
 
-static const TSLexMode ts_lex_modes[STATE_COUNT] = {
+static const TSLexerMode ts_lex_modes[STATE_COUNT] = {
   [0] = {.lex_state = 0, .external_lex_state = 1},
   [1] = {.lex_state = 8},
   [2] = {.lex_state = 1, .external_lex_state = 1},
@@ -669,7 +673,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
-  [0] = {
+  [STATE(0)] = {
     [ts_builtin_sym_end] = ACTIONS(1),
     [anon_sym_EQ] = ACTIONS(1),
     [sym_comment] = ACTIONS(1),
@@ -685,7 +689,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_boolean] = ACTIONS(1),
     [sym__end_of_assignment] = ACTIONS(1),
   },
-  [1] = {
+  [STATE(1)] = {
     [sym_document] = STATE(15),
     [sym_assignment] = STATE(4),
     [aux_sym_document_repeat1] = STATE(4),
@@ -693,7 +697,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_comment] = ACTIONS(5),
     [sym_identifier] = ACTIONS(7),
   },
-  [2] = {
+  [STATE(2)] = {
     [sym_variable] = STATE(19),
     [sym__value] = STATE(19),
     [sym_string] = STATE(19),
@@ -974,7 +978,7 @@ void tree_sitter_dotenv_external_scanner_deserialize(void *, const char *, unsig
 
 TS_PUBLIC const TSLanguage *tree_sitter_dotenv(void) {
   static const TSLanguage language = {
-    .version = LANGUAGE_VERSION,
+    .abi_version = LANGUAGE_VERSION,
     .symbol_count = SYMBOL_COUNT,
     .alias_count = ALIAS_COUNT,
     .token_count = TOKEN_COUNT,
@@ -982,6 +986,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_dotenv(void) {
     .state_count = STATE_COUNT,
     .large_state_count = LARGE_STATE_COUNT,
     .production_id_count = PRODUCTION_ID_COUNT,
+    .supertype_count = SUPERTYPE_COUNT,
     .field_count = FIELD_COUNT,
     .max_alias_sequence_length = MAX_ALIAS_SEQUENCE_LENGTH,
     .parse_table = &ts_parse_table[0][0],
@@ -996,7 +1001,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_dotenv(void) {
     .public_symbol_map = ts_symbol_map,
     .alias_map = ts_non_terminal_alias_map,
     .alias_sequences = &ts_alias_sequences[0][0],
-    .lex_modes = ts_lex_modes,
+    .lex_modes = (const void*)ts_lex_modes,
     .lex_fn = ts_lex,
     .external_scanner = {
       &ts_external_scanner_states[0][0],
@@ -1008,6 +1013,13 @@ TS_PUBLIC const TSLanguage *tree_sitter_dotenv(void) {
       tree_sitter_dotenv_external_scanner_deserialize,
     },
     .primary_state_ids = ts_primary_state_ids,
+    .name = "dotenv",
+    .max_reserved_word_set_size = 0,
+    .metadata = {
+      .major_version = 0,
+      .minor_version = 0,
+      .patch_version = 4,
+    },
   };
   return &language;
 }

src/tree_sitter/alloc.h

@@ -12,10 +12,10 @@ extern "C" {
 // Allow clients to override allocation functions
 #ifdef TREE_SITTER_REUSE_ALLOCATOR
 
-extern void *(*ts_current_malloc)(size_t);
+extern void *(*ts_current_malloc)(size_t size);
-extern void *(*ts_current_calloc)(size_t, size_t);
+extern void *(*ts_current_calloc)(size_t count, size_t size);
-extern void *(*ts_current_realloc)(void *, size_t);
+extern void *(*ts_current_realloc)(void *ptr, size_t size);
-extern void (*ts_current_free)(void *);
+extern void (*ts_current_free)(void *ptr);
 
 #ifndef ts_malloc
 #define ts_malloc  ts_current_malloc

src/tree_sitter/array.h

@@ -14,6 +14,7 @@ extern "C" {
 #include <string.h>
 
 #ifdef _MSC_VER
+#pragma warning(push)
 #pragma warning(disable : 4101)
 #elif defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
@@ -51,67 +52,91 @@ extern "C" {
 
 /// Reserve `new_capacity` elements of space in the array. If `new_capacity` is
 /// less than the array's current capacity, this function has no effect.
-#define array_reserve(self, new_capacity) \
+#define array_reserve(self, new_capacity)        \
-  _array__reserve((Array *)(self), array_elem_size(self), new_capacity)
+  ((self)->contents = _array__reserve(           \
+    (void *)(self)->contents, &(self)->capacity, \
+    array_elem_size(self), new_capacity)         \
+  )
 
 /// Free any memory allocated for this array. Note that this does not free any
 /// memory allocated for the array's contents.
-#define array_delete(self) _array__delete((Array *)(self))
+#define array_delete(self) _array__delete((self), (void *)(self)->contents, sizeof(*self))
 
 /// Push a new `element` onto the end of the array.
-#define array_push(self, element)                            \
+#define array_push(self, element)                                 \
-  (_array__grow((Array *)(self), 1, array_elem_size(self)), \
+  do {                                                            \
-   (self)->contents[(self)->size++] = (element))
+    (self)->contents = _array__grow(                              \
+      (void *)(self)->contents, (self)->size, &(self)->capacity,  \
+      1, array_elem_size(self)                                    \
+    );                                                            \
+   (self)->contents[(self)->size++] = (element);                  \
+  } while(0)
 
 /// Increase the array's size by `count` elements.
 /// New elements are zero-initialized.
-#define array_grow_by(self, count) \
+#define array_grow_by(self, count)                                               \
-  do { \
+  do {                                                                           \
-    if ((count) == 0) break; \
+    if ((count) == 0) break;                                                     \
-    _array__grow((Array *)(self), count, array_elem_size(self)); \
+    (self)->contents = _array__grow(                                             \
+      (self)->contents, (self)->size, &(self)->capacity,                         \
+      count, array_elem_size(self)                                               \
+    );                                                                           \
     memset((self)->contents + (self)->size, 0, (count) * array_elem_size(self)); \
-    (self)->size += (count); \
+    (self)->size += (count);                                                     \
   } while (0)
 
 /// Append all elements from one array to the end of another.
-#define array_push_all(self, other)                                       \
+#define array_push_all(self, other) \
   array_extend((self), (other)->size, (other)->contents)
 
 /// Append `count` elements to the end of the array, reading their values from the
 /// `contents` pointer.
-#define array_extend(self, count, contents)                    \
+#define array_extend(self, count, other_contents)                 \
-  _array__splice(                                               \
+  (self)->contents = _array__splice(                              \
-    (Array *)(self), array_elem_size(self), (self)->size, \
+    (void*)(self)->contents, &(self)->size, &(self)->capacity,    \
-    0, count,  contents                                        \
+    array_elem_size(self), (self)->size, 0, count, other_contents \
   )
 
 /// Remove `old_count` elements from the array starting at the given `index`. At
 /// the same index, insert `new_count` new elements, reading their values from the
 /// `new_contents` pointer.
-#define array_splice(self, _index, old_count, new_count, new_contents)  \
+#define array_splice(self, _index, old_count, new_count, new_contents) \
-  _array__splice(                                                       \
+  (self)->contents = _array__splice(                                   \
-    (Array *)(self), array_elem_size(self), _index,                \
+    (void *)(self)->contents, &(self)->size, &(self)->capacity,        \
-    old_count, new_count, new_contents                                 \
+    array_elem_size(self), _index, old_count, new_count, new_contents  \
   )
 
 /// Insert one `element` into the array at the given `index`.
-#define array_insert(self, _index, element) \
+#define array_insert(self, _index, element)                     \
-  _array__splice((Array *)(self), array_elem_size(self), _index, 0, 1, &(element))
+  (self)->contents = _array__splice(                            \
+    (void *)(self)->contents, &(self)->size, &(self)->capacity, \
+    array_elem_size(self), _index, 0, 1, &(element)             \
+  )
 
 /// Remove one element from the array at the given `index`.
 #define array_erase(self, _index) \
-  _array__erase((Array *)(self), array_elem_size(self), _index)
+  _array__erase((void *)(self)->contents, &(self)->size, array_elem_size(self), _index)
 
 /// Pop the last element off the array, returning the element by value.
 #define array_pop(self) ((self)->contents[--(self)->size])
 
 /// Assign the contents of one array to another, reallocating if necessary.
-#define array_assign(self, other) \
+#define array_assign(self, other)                                   \
-  _array__assign((Array *)(self), (const Array *)(other), array_elem_size(self))
+  (self)->contents = _array__assign(                                \
+    (void *)(self)->contents, &(self)->size, &(self)->capacity,     \
+    (const void *)(other)->contents, (other)->size, array_elem_size(self) \
+  )
 
 /// Swap one array with another
-#define array_swap(self, other) \
+#define array_swap(self, other)                                     \
-  _array__swap((Array *)(self), (Array *)(other))
+  do {                                                              \
+    struct Swap swapped_contents = _array__swap(                    \
+      (void *)(self)->contents, &(self)->size, &(self)->capacity,   \
+      (void *)(other)->contents, &(other)->size, &(other)->capacity \
+    );                                                              \
+    (self)->contents = swapped_contents.self_contents;              \
+    (other)->contents = swapped_contents.other_contents;            \
+  } while (0)
 
 /// Get the size of the array contents
 #define array_elem_size(self) (sizeof *(self)->contents)
@@ -156,82 +181,112 @@ extern "C" {
 
 // Private
 
-typedef Array(void) Array;
+// Pointers to individual `Array` fields (rather than the entire `Array` itself)
+// are passed to the various `_array__*` functions below to address strict aliasing
+// violations that arises when the _entire_ `Array` struct is passed as `Array(void)*`.
+//
+// The `Array` type itself was not altered as a solution in order to avoid breakage
+// with existing consumers (in particular, parsers with external scanners).
 
 /// This is not what you're looking for, see `array_delete`.
-static inline void _array__delete(Array *self) {
+static inline void _array__delete(void *self, void *contents, size_t self_size) {
-  if (self->contents) {
+  if (contents) ts_free(contents);
-    ts_free(self->contents);
+  if (self) memset(self, 0, self_size);
-    self->contents = NULL;
-    self->size = 0;
-    self->capacity = 0;
-  }
 }
 
 /// This is not what you're looking for, see `array_erase`.
-static inline void _array__erase(Array *self, size_t element_size,
+static inline void _array__erase(void* self_contents, uint32_t *size,
-                                uint32_t index) {
+                                size_t element_size, uint32_t index) {
-  assert(index < self->size);
+  assert(index < *size);
-  char *contents = (char *)self->contents;
+  char *contents = (char *)self_contents;
   memmove(contents + index * element_size, contents + (index + 1) * element_size,
-          (self->size - index - 1) * element_size);
+          (*size - index - 1) * element_size);
-  self->size--;
+  (*size)--;
 }
 
 /// This is not what you're looking for, see `array_reserve`.
-static inline void _array__reserve(Array *self, size_t element_size, uint32_t new_capacity) {
+static inline void *_array__reserve(void *contents, uint32_t *capacity,
-  if (new_capacity > self->capacity) {
+                                  size_t element_size, uint32_t new_capacity) {
-    if (self->contents) {
+  void *new_contents = contents;
-      self->contents = ts_realloc(self->contents, new_capacity * element_size);
+  if (new_capacity > *capacity) {
+    if (contents) {
+      new_contents = ts_realloc(contents, new_capacity * element_size);
     } else {
-      self->contents = ts_malloc(new_capacity * element_size);
+      new_contents = ts_malloc(new_capacity * element_size);
     }
-    self->capacity = new_capacity;
+    *capacity = new_capacity;
   }
+  return new_contents;
 }
 
 /// This is not what you're looking for, see `array_assign`.
-static inline void _array__assign(Array *self, const Array *other, size_t element_size) {
+static inline void *_array__assign(void* self_contents, uint32_t *self_size, uint32_t *self_capacity,
-  _array__reserve(self, element_size, other->size);
+                                 const void *other_contents, uint32_t other_size, size_t element_size) {
-  self->size = other->size;
+  void *new_contents = _array__reserve(self_contents, self_capacity, element_size, other_size);
-  memcpy(self->contents, other->contents, self->size * element_size);
+  *self_size = other_size;
+  memcpy(new_contents, other_contents, *self_size * element_size);
+  return new_contents;
 }
 
+struct Swap {
+  void *self_contents;
+  void *other_contents;
+};
+
 /// This is not what you're looking for, see `array_swap`.
-static inline void _array__swap(Array *self, Array *other) {
+// static inline void _array__swap(Array *self, Array *other) {
-  Array swap = *other;
+static inline struct Swap _array__swap(void *self_contents, uint32_t *self_size, uint32_t *self_capacity,
-  *other = *self;
+                               void *other_contents, uint32_t *other_size, uint32_t *other_capacity) {
-  *self = swap;
+  void *new_self_contents = other_contents;
+  uint32_t new_self_size = *other_size;
+  uint32_t new_self_capacity = *other_capacity;
+
+  void *new_other_contents = self_contents;
+  *other_size = *self_size;
+  *other_capacity = *self_capacity;
+
+  *self_size = new_self_size;
+  *self_capacity = new_self_capacity;
+
+  struct Swap out = {
+    .self_contents = new_self_contents,
+    .other_contents = new_other_contents,
+  };
+  return out;
 }
 
 /// This is not what you're looking for, see `array_push` or `array_grow_by`.
-static inline void _array__grow(Array *self, uint32_t count, size_t element_size) {
+static inline void *_array__grow(void *contents, uint32_t size, uint32_t *capacity,
-  uint32_t new_size = self->size + count;
+                               uint32_t count, size_t element_size) {
-  if (new_size > self->capacity) {
+  void *new_contents = contents;
-    uint32_t new_capacity = self->capacity * 2;
+  uint32_t new_size = size + count;
+  if (new_size > *capacity) {
+    uint32_t new_capacity = *capacity * 2;
     if (new_capacity < 8) new_capacity = 8;
     if (new_capacity < new_size) new_capacity = new_size;
-    _array__reserve(self, element_size, new_capacity);
+    new_contents = _array__reserve(contents, capacity, element_size, new_capacity);
   }
+  return new_contents;
 }
 
 /// This is not what you're looking for, see `array_splice`.
-static inline void _array__splice(Array *self, size_t element_size,
+static inline void *_array__splice(void *self_contents, uint32_t *size, uint32_t *capacity,
+                                 size_t element_size,
                                  uint32_t index, uint32_t old_count,
                                  uint32_t new_count, const void *elements) {
-  uint32_t new_size = self->size + new_count - old_count;
+  uint32_t new_size = *size + new_count - old_count;
   uint32_t old_end = index + old_count;
   uint32_t new_end = index + new_count;
-  assert(old_end <= self->size);
+  assert(old_end <= *size);
 
-  _array__reserve(self, element_size, new_size);
+  void *new_contents = _array__reserve(self_contents, capacity, element_size, new_size);
 
-  char *contents = (char *)self->contents;
+  char *contents = (char *)new_contents;
-  if (self->size > old_end) {
+  if (*size > old_end) {
     memmove(
       contents + new_end * element_size,
       contents + old_end * element_size,
-      (self->size - old_end) * element_size
+      (*size - old_end) * element_size
     );
   }
   if (new_count > 0) {
@@ -249,7 +304,9 @@ static inline void _array__splice(Array *self, size_t element_size,
       );
     }
   }
-  self->size += new_count - old_count;
+  *size += new_count - old_count;
+
+  return new_contents;
 }
 
 /// A binary search routine, based on Rust's `std::slice::binary_search_by`.
@@ -278,7 +335,7 @@ static inline void _array__splice(Array *self, size_t element_size,
 #define _compare_int(a, b) ((int)*(a) - (int)(b))
 
 #ifdef _MSC_VER
-#pragma warning(default : 4101)
+#pragma warning(pop)
 #elif defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif

src/tree_sitter/parser.h

@@ -18,6 +18,11 @@ typedef uint16_t TSStateId;
 typedef uint16_t TSSymbol;
 typedef uint16_t TSFieldId;
 typedef struct TSLanguage TSLanguage;
+typedef struct TSLanguageMetadata {
+  uint8_t major_version;
+  uint8_t minor_version;
+  uint8_t patch_version;
+} TSLanguageMetadata;
 #endif
 
 typedef struct {
@@ -26,10 +31,11 @@ typedef struct {
   bool inherited;
 } TSFieldMapEntry;
 
+// Used to index the field and supertype maps.
 typedef struct {
   uint16_t index;
   uint16_t length;
-} TSFieldMapSlice;
+} TSMapSlice;
 
 typedef struct {
   bool visible;
@@ -79,6 +85,12 @@ typedef struct {
   uint16_t external_lex_state;
 } TSLexMode;
 
+typedef struct {
+  uint16_t lex_state;
+  uint16_t external_lex_state;
+  uint16_t reserved_word_set_id;
+} TSLexerMode;
+
 typedef union {
   TSParseAction action;
   struct {
@@ -93,7 +105,7 @@ typedef struct {
 } TSCharacterRange;
 
 struct TSLanguage {
-  uint32_t version;
+  uint32_t abi_version;
   uint32_t symbol_count;
   uint32_t alias_count;
   uint32_t token_count;
@@ -109,13 +121,13 @@ struct TSLanguage {
   const TSParseActionEntry *parse_actions;
   const char * const *symbol_names;
   const char * const *field_names;
-  const TSFieldMapSlice *field_map_slices;
+  const TSMapSlice *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;
+  const TSLexerMode *lex_modes;
   bool (*lex_fn)(TSLexer *, TSStateId);
   bool (*keyword_lex_fn)(TSLexer *, TSStateId);
   TSSymbol keyword_capture_token;
@@ -129,15 +141,23 @@ struct TSLanguage {
     void (*deserialize)(void *, const char *, unsigned);
   } external_scanner;
   const TSStateId *primary_state_ids;
+  const char *name;
+  const TSSymbol *reserved_words;
+  uint16_t max_reserved_word_set_size;
+  uint32_t supertype_count;
+  const TSSymbol *supertype_symbols;
+  const TSMapSlice *supertype_map_slices;
+  const TSSymbol *supertype_map_entries;
+  TSLanguageMetadata metadata;
 };
 
-static inline bool set_contains(TSCharacterRange *ranges, uint32_t len, int32_t lookahead) {
+static inline bool set_contains(const TSCharacterRange *ranges, uint32_t len, int32_t lookahead) {
   uint32_t index = 0;
   uint32_t size = len - index;
   while (size > 1) {
     uint32_t half_size = size / 2;
     uint32_t mid_index = index + half_size;
-    TSCharacterRange *range = &ranges[mid_index];
+    const TSCharacterRange *range = &ranges[mid_index];
     if (lookahead >= range->start && lookahead <= range->end) {
       return true;
     } else if (lookahead > range->end) {
@@ -145,7 +165,7 @@ static inline bool set_contains(TSCharacterRange *ranges, uint32_t len, int32_t
     }
     size -= half_size;
   }
-  TSCharacterRange *range = &ranges[index];
+  const TSCharacterRange *range = &ranges[index];
   return (lookahead >= range->start && lookahead <= range->end);
 }