chore(version): v1.4.0 v1.4.0

3 files changed, 477 insertions, 410 deletions

diff --git a/tree-sitter-yts/src/tree_sitter/alloc.h b/tree-sitter-yts/src/tree_sitter/alloc.h
index e5e685d..fcaeaad 100644
--- a/tree-sitter-yts/src/tree_sitter/alloc.h
+++ b/tree-sitter-yts/src/tree_sitter/alloc.h
@@ -14,7 +14,8 @@
 #define TREE_SITTER_ALLOC_H_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <stdbool.h>
@@ -24,37 +25,37 @@ extern "C" {
 // Allow clients to override allocation functions
 #ifdef TREE_SITTER_REUSE_ALLOCATOR
 
-extern void *(*ts_current_malloc)(size_t size);
-extern void *(*ts_current_calloc)(size_t count, size_t size);
-extern void *(*ts_current_realloc)(void *ptr, size_t size);
-extern void (*ts_current_free)(void *ptr);
+  extern void *(*ts_current_malloc) (size_t size);
+  extern void *(*ts_current_calloc) (size_t count, size_t size);
+  extern void *(*ts_current_realloc) (void *ptr, size_t size);
+  extern void (*ts_current_free) (void *ptr);
 
 #ifndef ts_malloc
-#define ts_malloc  ts_current_malloc
+#define ts_malloc ts_current_malloc
 #endif
 #ifndef ts_calloc
-#define ts_calloc  ts_current_calloc
+#define ts_calloc ts_current_calloc
 #endif
 #ifndef ts_realloc
 #define ts_realloc ts_current_realloc
 #endif
 #ifndef ts_free
-#define ts_free    ts_current_free
+#define ts_free ts_current_free
 #endif
 
 #else
 
 #ifndef ts_malloc
-#define ts_malloc  malloc
+#define ts_malloc malloc
 #endif
 #ifndef ts_calloc
-#define ts_calloc  calloc
+#define ts_calloc calloc
 #endif
 #ifndef ts_realloc
 #define ts_realloc realloc
 #endif
 #ifndef ts_free
-#define ts_free    free
+#define ts_free free
 #endif
 
 #endif
diff --git a/tree-sitter-yts/src/tree_sitter/array.h b/tree-sitter-yts/src/tree_sitter/array.h
index a961107..576d72e 100644
--- a/tree-sitter-yts/src/tree_sitter/array.h
+++ b/tree-sitter-yts/src/tree_sitter/array.h
@@ -14,7 +14,8 @@
 #define TREE_SITTER_ARRAY_H_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "./alloc.h"
@@ -32,30 +33,30 @@ extern "C" {
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
-#define Array(T)       \
-  struct {             \
-    T *contents;       \
-    uint32_t size;     \
-    uint32_t capacity; \
+#define Array(T)                                                              \
+  struct                                                                      \
+  {                                                                           \
+    T *contents;                                                              \
+    uint32_t size;                                                            \
+    uint32_t capacity;                                                        \
   }
 
 /// Initialize an array.
-#define array_init(self) \
+#define array_init(self)                                                      \
   ((self)->size = 0, (self)->capacity = 0, (self)->contents = NULL)
 
 /// Create an empty array.
-#define array_new() \
-  { NULL, 0, 0 }
+#define array_new() { NULL, 0, 0 }
 
 /// Get a pointer to the element at a given `index` in the array.
-#define array_get(self, _index) \
-  (assert((uint32_t)(_index) < (self)->size), &(self)->contents[_index])
+#define array_get(self, _index)                                               \
+  (assert ((uint32_t)(_index) < (self)->size), &(self)->contents[_index])
 
 /// Get a pointer to the first element in the array.
-#define array_front(self) array_get(self, 0)
+#define array_front(self) array_get (self, 0)
 
 /// Get a pointer to the last element in the array.
-#define array_back(self) array_get(self, (self)->size - 1)
+#define array_back(self) array_get (self, (self)->size - 1)
 
 /// Clear the array, setting its size to zero. Note that this does not free any
 /// memory allocated for the array's contents.
@@ -63,67 +64,69 @@ 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) \
-  _array__reserve((Array *)(self), array_elem_size(self), new_capacity)
+#define array_reserve(self, new_capacity)                                     \
+  _array__reserve ((Array *)(self), 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 ((Array *)(self))
 
 /// Push a new `element` onto the end of the array.
-#define array_push(self, element)                            \
-  (_array__grow((Array *)(self), 1, array_elem_size(self)), \
+#define array_push(self, element)                                             \
+  (_array__grow ((Array *)(self), 1, array_elem_size (self)),                 \
    (self)->contents[(self)->size++] = (element))
 
 /// Increase the array's size by `count` elements.
 /// New elements are zero-initialized.
-#define array_grow_by(self, count) \
-  do { \
-    if ((count) == 0) break; \
-    _array__grow((Array *)(self), count, array_elem_size(self)); \
-    memset((self)->contents + (self)->size, 0, (count) * array_elem_size(self)); \
-    (self)->size += (count); \
-  } while (0)
+#define array_grow_by(self, count)                                            \
+  do                                                                          \
+    {                                                                         \
+      if ((count) == 0)                                                       \
+        break;                                                                \
+      _array__grow ((Array *)(self), count, array_elem_size (self));          \
+      memset ((self)->contents + (self)->size, 0,                             \
+              (count) * array_elem_size (self));                              \
+      (self)->size += (count);                                                \
+    }                                                                         \
+  while (0)
 
 /// Append all elements from one array to the end of another.
-#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)                    \
-  _array__splice(                                               \
-    (Array *)(self), array_elem_size(self), (self)->size, \
-    0, count,  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)  \
-  _array__splice(                                                       \
-    (Array *)(self), array_elem_size(self), _index,                \
-    old_count, new_count, new_contents                                 \
-  )
+#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)                                   \
+  _array__splice ((Array *)(self), array_elem_size (self), (self)->size, 0,   \
+                  count, 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)        \
+  _array__splice ((Array *)(self), 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) \
-  _array__splice((Array *)(self), array_elem_size(self), _index, 0, 1, &(element))
+#define array_insert(self, _index, element)                                   \
+  _array__splice ((Array *)(self), 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)
+#define array_erase(self, _index)                                             \
+  _array__erase ((Array *)(self), 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) \
-  _array__assign((Array *)(self), (const Array *)(other), array_elem_size(self))
+#define array_assign(self, other)                                             \
+  _array__assign ((Array *)(self), (const Array *)(other),                    \
+                  array_elem_size (self))
 
 /// Swap one array with another
-#define array_swap(self, other) \
-  _array__swap((Array *)(self), (Array *)(other))
+#define array_swap(self, other)                                               \
+  _array__swap ((Array *)(self), (Array *)(other))
 
 /// Get the size of the array contents
 #define array_elem_size(self) (sizeof *(self)->contents)
@@ -136,157 +139,194 @@ extern "C" {
 /// out-parameter is set to true. Otherwise, `index` is set to an index where
 /// `needle` should be inserted in order to preserve the sorting, and `exists`
 /// is set to false.
-#define array_search_sorted_with(self, compare, needle, _index, _exists) \
-  _array__search_sorted(self, 0, compare, , needle, _index, _exists)
+#define array_search_sorted_with(self, compare, needle, _index, _exists)      \
+  _array__search_sorted (self, 0, compare, , needle, _index, _exists)
 
 /// Search a sorted array for a given `needle` value, using integer comparisons
-/// of a given struct field (specified with a leading dot) to determine the order.
+/// of a given struct field (specified with a leading dot) to determine the
+/// order.
 ///
 /// See also `array_search_sorted_with`.
-#define array_search_sorted_by(self, field, needle, _index, _exists) \
-  _array__search_sorted(self, 0, _compare_int, field, needle, _index, _exists)
+#define array_search_sorted_by(self, field, needle, _index, _exists)          \
+  _array__search_sorted (self, 0, _compare_int, field, needle, _index, _exists)
 
 /// Insert a given `value` into a sorted array, using the given `compare`
 /// callback to determine the order.
-#define array_insert_sorted_with(self, compare, value) \
-  do { \
-    unsigned _index, _exists; \
-    array_search_sorted_with(self, compare, &(value), &_index, &_exists); \
-    if (!_exists) array_insert(self, _index, value); \
-  } while (0)
+#define array_insert_sorted_with(self, compare, value)                        \
+  do                                                                          \
+    {                                                                         \
+      unsigned _index, _exists;                                               \
+      array_search_sorted_with (self, compare, &(value), &_index, &_exists);  \
+      if (!_exists)                                                           \
+        array_insert (self, _index, value);                                   \
+    }                                                                         \
+  while (0)
 
 /// Insert a given `value` into a sorted array, using integer comparisons of
 /// a given struct field (specified with a leading dot) to determine the order.
 ///
 /// See also `array_search_sorted_by`.
-#define array_insert_sorted_by(self, field, value) \
-  do { \
-    unsigned _index, _exists; \
-    array_search_sorted_by(self, field, (value) field, &_index, &_exists); \
-    if (!_exists) array_insert(self, _index, value); \
-  } while (0)
-
-// Private
-
-typedef Array(void) Array;
-
-/// This is not what you're looking for, see `array_delete`.
-static inline void _array__delete(Array *self) {
-  if (self->contents) {
-    ts_free(self->contents);
-    self->contents = NULL;
-    self->size = 0;
-    self->capacity = 0;
+#define array_insert_sorted_by(self, field, value)                            \
+  do                                                                          \
+    {                                                                         \
+      unsigned _index, _exists;                                               \
+      array_search_sorted_by (self, field, (value)field, &_index, &_exists);  \
+      if (!_exists)                                                           \
+        array_insert (self, _index, value);                                   \
+    }                                                                         \
+  while (0)
+
+  // Private
+
+  typedef Array (void) Array;
+
+  /// This is not what you're looking for, see `array_delete`.
+  static inline void
+  _array__delete (Array *self)
+  {
+    if (self->contents)
+      {
+        ts_free (self->contents);
+        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,
-                                uint32_t index) {
-  assert(index < self->size);
-  char *contents = (char *)self->contents;
-  memmove(contents + index * element_size, contents + (index + 1) * element_size,
-          (self->size - index - 1) * element_size);
-  self->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) {
-  if (new_capacity > self->capacity) {
-    if (self->contents) {
-      self->contents = ts_realloc(self->contents, new_capacity * element_size);
-    } else {
-      self->contents = ts_malloc(new_capacity * element_size);
-    }
-    self->capacity = new_capacity;
+  /// This is not what you're looking for, see `array_erase`.
+  static inline void
+  _array__erase (Array *self, size_t element_size, uint32_t index)
+  {
+    assert (index < self->size);
+    char *contents = (char *)self->contents;
+    memmove (contents + index * element_size,
+             contents + (index + 1) * element_size,
+             (self->size - index - 1) * element_size);
+    self->size--;
   }
-}
 
-/// 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) {
-  _array__reserve(self, element_size, other->size);
-  self->size = other->size;
-  memcpy(self->contents, other->contents, self->size * element_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)
+  {
+    if (new_capacity > self->capacity)
+      {
+        if (self->contents)
+          {
+            self->contents
+                = ts_realloc (self->contents, new_capacity * element_size);
+          }
+        else
+          {
+            self->contents = ts_malloc (new_capacity * element_size);
+          }
+        self->capacity = new_capacity;
+      }
+  }
 
-/// This is not what you're looking for, see `array_swap`.
-static inline void _array__swap(Array *self, Array *other) {
-  Array swap = *other;
-  *other = *self;
-  *self = swap;
-}
+  /// 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)
+  {
+    _array__reserve (self, element_size, other->size);
+    self->size = other->size;
+    memcpy (self->contents, other->contents, self->size * element_size);
+  }
 
-/// 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) {
-  uint32_t new_size = self->size + count;
-  if (new_size > self->capacity) {
-    uint32_t new_capacity = self->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);
+  /// This is not what you're looking for, see `array_swap`.
+  static inline void
+  _array__swap (Array *self, Array *other)
+  {
+    Array swap = *other;
+    *other = *self;
+    *self = swap;
   }
-}
 
-/// This is not what you're looking for, see `array_splice`.
-static inline void _array__splice(Array *self, 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 old_end = index + old_count;
-  uint32_t new_end = index + new_count;
-  assert(old_end <= self->size);
-
-  _array__reserve(self, element_size, new_size);
-
-  char *contents = (char *)self->contents;
-  if (self->size > old_end) {
-    memmove(
-      contents + new_end * element_size,
-      contents + old_end * element_size,
-      (self->size - old_end) * element_size
-    );
+  /// 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)
+  {
+    uint32_t new_size = self->size + count;
+    if (new_size > self->capacity)
+      {
+        uint32_t new_capacity = self->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);
+      }
   }
-  if (new_count > 0) {
-    if (elements) {
-      memcpy(
-        (contents + index * element_size),
-        elements,
-        new_count * element_size
-      );
-    } else {
-      memset(
-        (contents + index * element_size),
-        0,
-        new_count * element_size
-      );
-    }
+
+  /// This is not what you're looking for, see `array_splice`.
+  static inline void
+  _array__splice (Array *self, 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 old_end = index + old_count;
+    uint32_t new_end = index + new_count;
+    assert (old_end <= self->size);
+
+    _array__reserve (self, element_size, new_size);
+
+    char *contents = (char *)self->contents;
+    if (self->size > old_end)
+      {
+        memmove (contents + new_end * element_size,
+                 contents + old_end * element_size,
+                 (self->size - old_end) * element_size);
+      }
+    if (new_count > 0)
+      {
+        if (elements)
+          {
+            memcpy ((contents + index * element_size), elements,
+                    new_count * element_size);
+          }
+        else
+          {
+            memset ((contents + index * element_size), 0,
+                    new_count * element_size);
+          }
+      }
+    self->size += new_count - old_count;
   }
-  self->size += new_count - old_count;
-}
 
 /// A binary search routine, based on Rust's `std::slice::binary_search_by`.
-/// This is not what you're looking for, see `array_search_sorted_with` or `array_search_sorted_by`.
-#define _array__search_sorted(self, start, compare, suffix, needle, _index, _exists) \
-  do { \
-    *(_index) = start; \
-    *(_exists) = false; \
-    uint32_t size = (self)->size - *(_index); \
-    if (size == 0) break; \
-    int comparison; \
-    while (size > 1) { \
-      uint32_t half_size = size / 2; \
-      uint32_t mid_index = *(_index) + half_size; \
-      comparison = compare(&((self)->contents[mid_index] suffix), (needle)); \
-      if (comparison <= 0) *(_index) = mid_index; \
-      size -= half_size; \
-    } \
-    comparison = compare(&((self)->contents[*(_index)] suffix), (needle)); \
-    if (comparison == 0) *(_exists) = true; \
-    else if (comparison < 0) *(_index) += 1; \
-  } while (0)
-
-/// Helper macro for the `_sorted_by` routines below. This takes the left (existing)
-/// parameter by reference in order to work with the generic sorting function above.
+/// This is not what you're looking for, see `array_search_sorted_with` or
+/// `array_search_sorted_by`.
+#define _array__search_sorted(self, start, compare, suffix, needle, _index,   \
+                              _exists)                                        \
+  do                                                                          \
+    {                                                                         \
+      *(_index) = start;                                                      \
+      *(_exists) = false;                                                     \
+      uint32_t size = (self)->size - *(_index);                               \
+      if (size == 0)                                                          \
+        break;                                                                \
+      int comparison;                                                         \
+      while (size > 1)                                                        \
+        {                                                                     \
+          uint32_t half_size = size / 2;                                      \
+          uint32_t mid_index = *(_index) + half_size;                         \
+          comparison                                                          \
+              = compare (&((self)->contents[mid_index] suffix), (needle));    \
+          if (comparison <= 0)                                                \
+            *(_index) = mid_index;                                            \
+          size -= half_size;                                                  \
+        }                                                                     \
+      comparison = compare (&((self)->contents[*(_index)] suffix), (needle)); \
+      if (comparison == 0)                                                    \
+        *(_exists) = true;                                                    \
+      else if (comparison < 0)                                                \
+        *(_index) += 1;                                                       \
+    }                                                                         \
+  while (0)
+
+/// Helper macro for the `_sorted_by` routines below. This takes the left
+/// (existing) parameter by reference in order to work with the generic sorting
+/// function above.
 #define _compare_int(a, b) ((int)*(a) - (int)(b))
 
 #ifdef _MSC_VER
@@ -299,4 +339,4 @@ static inline void _array__splice(Array *self, size_t element_size,
 }
 #endif
 
-#endif  // TREE_SITTER_ARRAY_H_
+#endif // TREE_SITTER_ARRAY_H_
diff --git a/tree-sitter-yts/src/tree_sitter/parser.h b/tree-sitter-yts/src/tree_sitter/parser.h
index fab4621..aec3b17 100644
--- a/tree-sitter-yts/src/tree_sitter/parser.h
+++ b/tree-sitter-yts/src/tree_sitter/parser.h
@@ -14,210 +14,233 @@
 #define TREE_SITTER_PARSER_H_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#define ts_builtin_sym_error ((TSSymbol)-1)
+#define ts_builtin_sym_error ((TSSymbol) - 1)
 #define ts_builtin_sym_end 0
 #define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
 
 #ifndef TREE_SITTER_API_H_
-typedef uint16_t TSStateId;
-typedef uint16_t TSSymbol;
-typedef uint16_t TSFieldId;
-typedef struct TSLanguage TSLanguage;
+  typedef uint16_t TSStateId;
+  typedef uint16_t TSSymbol;
+  typedef uint16_t TSFieldId;
+  typedef struct TSLanguage TSLanguage;
 #endif
 
-typedef struct {
-  TSFieldId field_id;
-  uint8_t child_index;
-  bool inherited;
-} TSFieldMapEntry;
-
-typedef struct {
-  uint16_t index;
-  uint16_t length;
-} TSFieldMapSlice;
-
-typedef struct {
-  bool visible;
-  bool named;
-  bool supertype;
-} TSSymbolMetadata;
-
-typedef struct TSLexer TSLexer;
-
-struct TSLexer {
-  int32_t lookahead;
-  TSSymbol result_symbol;
-  void (*advance)(TSLexer *, bool);
-  void (*mark_end)(TSLexer *);
-  uint32_t (*get_column)(TSLexer *);
-  bool (*is_at_included_range_start)(const TSLexer *);
-  bool (*eof)(const TSLexer *);
-  void (*log)(const TSLexer *, const char *, ...);
-};
-
-typedef enum {
-  TSParseActionTypeShift,
-  TSParseActionTypeReduce,
-  TSParseActionTypeAccept,
-  TSParseActionTypeRecover,
-} TSParseActionType;
-
-typedef union {
-  struct {
+  typedef struct
+  {
+    TSFieldId field_id;
+    uint8_t child_index;
+    bool inherited;
+  } TSFieldMapEntry;
+
+  typedef struct
+  {
+    uint16_t index;
+    uint16_t length;
+  } TSFieldMapSlice;
+
+  typedef struct
+  {
+    bool visible;
+    bool named;
+    bool supertype;
+  } TSSymbolMetadata;
+
+  typedef struct TSLexer TSLexer;
+
+  struct TSLexer
+  {
+    int32_t lookahead;
+    TSSymbol result_symbol;
+    void (*advance) (TSLexer *, bool);
+    void (*mark_end) (TSLexer *);
+    uint32_t (*get_column) (TSLexer *);
+    bool (*is_at_included_range_start) (const TSLexer *);
+    bool (*eof) (const TSLexer *);
+    void (*log) (const TSLexer *, const char *, ...);
+  };
+
+  typedef enum
+  {
+    TSParseActionTypeShift,
+    TSParseActionTypeReduce,
+    TSParseActionTypeAccept,
+    TSParseActionTypeRecover,
+  } TSParseActionType;
+
+  typedef union
+  {
+    struct
+    {
+      uint8_t type;
+      TSStateId state;
+      bool extra;
+      bool repetition;
+    } shift;
+    struct
+    {
+      uint8_t type;
+      uint8_t child_count;
+      TSSymbol symbol;
+      int16_t dynamic_precedence;
+      uint16_t production_id;
+    } reduce;
     uint8_t type;
-    TSStateId state;
-    bool extra;
-    bool repetition;
-  } shift;
-  struct {
-    uint8_t type;
-    uint8_t child_count;
-    TSSymbol symbol;
-    int16_t dynamic_precedence;
-    uint16_t production_id;
-  } reduce;
-  uint8_t type;
-} TSParseAction;
-
-typedef struct {
-  uint16_t lex_state;
-  uint16_t external_lex_state;
-} TSLexMode;
-
-typedef union {
-  TSParseAction action;
-  struct {
-    uint8_t count;
-    bool reusable;
-  } entry;
-} TSParseActionEntry;
-
-typedef struct {
-  int32_t start;
-  int32_t end;
-} TSCharacterRange;
-
-struct TSLanguage {
-  uint32_t version;
-  uint32_t symbol_count;
-  uint32_t alias_count;
-  uint32_t token_count;
-  uint32_t external_token_count;
-  uint32_t state_count;
-  uint32_t large_state_count;
-  uint32_t production_id_count;
-  uint32_t field_count;
-  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 * const *symbol_names;
-  const char * const *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;
-  struct {
-    const bool *states;
-    const TSSymbol *symbol_map;
-    void *(*create)(void);
-    void (*destroy)(void *);
-    bool (*scan)(void *, TSLexer *, const bool *symbol_whitelist);
-    unsigned (*serialize)(void *, char *);
-    void (*deserialize)(void *, const char *, unsigned);
-  } external_scanner;
-  const TSStateId *primary_state_ids;
-};
-
-static inline bool set_contains(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];
-    if (lookahead >= range->start && lookahead <= range->end) {
-      return true;
-    } else if (lookahead > range->end) {
-      index = mid_index;
-    }
-    size -= half_size;
+  } TSParseAction;
+
+  typedef struct
+  {
+    uint16_t lex_state;
+    uint16_t external_lex_state;
+  } TSLexMode;
+
+  typedef union
+  {
+    TSParseAction action;
+    struct
+    {
+      uint8_t count;
+      bool reusable;
+    } entry;
+  } TSParseActionEntry;
+
+  typedef struct
+  {
+    int32_t start;
+    int32_t end;
+  } TSCharacterRange;
+
+  struct TSLanguage
+  {
+    uint32_t version;
+    uint32_t symbol_count;
+    uint32_t alias_count;
+    uint32_t token_count;
+    uint32_t external_token_count;
+    uint32_t state_count;
+    uint32_t large_state_count;
+    uint32_t production_id_count;
+    uint32_t field_count;
+    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 *const *symbol_names;
+    const char *const *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;
+    struct
+    {
+      const bool *states;
+      const TSSymbol *symbol_map;
+      void *(*create) (void);
+      void (*destroy) (void *);
+      bool (*scan) (void *, TSLexer *, const bool *symbol_whitelist);
+      unsigned (*serialize) (void *, char *);
+      void (*deserialize) (void *, const char *, unsigned);
+    } external_scanner;
+    const TSStateId *primary_state_ids;
+  };
+
+  static inline bool
+  set_contains (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];
+        if (lookahead >= range->start && lookahead <= range->end)
+          {
+            return true;
+          }
+        else if (lookahead > range->end)
+          {
+            index = mid_index;
+          }
+        size -= half_size;
+      }
+    TSCharacterRange *range = &ranges[index];
+    return (lookahead >= range->start && lookahead <= range->end);
   }
-  TSCharacterRange *range = &ranges[index];
-  return (lookahead >= range->start && lookahead <= range->end);
-}
 
-/*
- *  Lexer Macros
- */
+  /*
+   *  Lexer Macros
+   */
 
 #ifdef _MSC_VER
-#define UNUSED __pragma(warning(suppress : 4101))
+#define UNUSED __pragma (warning (suppress : 4101))
 #else
-#define UNUSED __attribute__((unused))
+#define UNUSED __attribute__ ((unused))
 #endif
 
-#define START_LEXER()           \
-  bool result = false;          \
-  bool skip = false;            \
-  UNUSED                        \
-  bool eof = false;             \
-  int32_t lookahead;            \
-  goto start;                   \
-  next_state:                   \
-  lexer->advance(lexer, skip);  \
-  start:                        \
-  skip = false;                 \
+#define START_LEXER()                                                         \
+  bool result = false;                                                        \
+  bool skip = false;                                                          \
+  UNUSED                                                                      \
+  bool eof = false;                                                           \
+  int32_t lookahead;                                                          \
+  goto start;                                                                 \
+  next_state:                                                                 \
+  lexer->advance (lexer, skip);                                               \
+  start:                                                                      \
+  skip = false;                                                               \
   lookahead = lexer->lookahead;
 
-#define ADVANCE(state_value) \
-  {                          \
-    state = state_value;     \
-    goto next_state;         \
+#define ADVANCE(state_value)                                                  \
+  {                                                                           \
+    state = state_value;                                                      \
+    goto next_state;                                                          \
   }
 
-#define ADVANCE_MAP(...)                                              \
-  {                                                                   \
-    static const uint16_t map[] = { __VA_ARGS__ };                    \
-    for (uint32_t i = 0; i < sizeof(map) / sizeof(map[0]); i += 2) {  \
-      if (map[i] == lookahead) {                                      \
-        state = map[i + 1];                                           \
-        goto next_state;                                              \
-      }                                                               \
-    }                                                                 \
+#define ADVANCE_MAP(...)                                                      \
+  {                                                                           \
+    static const uint16_t map[] = { __VA_ARGS__ };                            \
+    for (uint32_t i = 0; i < sizeof (map) / sizeof (map[0]); i += 2)          \
+      {                                                                       \
+        if (map[i] == lookahead)                                              \
+          {                                                                   \
+            state = map[i + 1];                                               \
+            goto next_state;                                                  \
+          }                                                                   \
+      }                                                                       \
   }
 
-#define SKIP(state_value) \
-  {                       \
-    skip = true;          \
-    state = state_value;  \
-    goto next_state;      \
+#define SKIP(state_value)                                                     \
+  {                                                                           \
+    skip = true;                                                              \
+    state = state_value;                                                      \
+    goto next_state;                                                          \
   }
 
-#define ACCEPT_TOKEN(symbol_value)     \
-  result = true;                       \
-  lexer->result_symbol = symbol_value; \
-  lexer->mark_end(lexer);
+#define ACCEPT_TOKEN(symbol_value)                                            \
+  result = true;                                                              \
+  lexer->result_symbol = symbol_value;                                        \
+  lexer->mark_end (lexer);
 
 #define END_STATE() return result;
 
-/*
- *  Parse Table Macros
- */
+  /*
+   *  Parse Table Macros
+   */
 
 #define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT)
 
@@ -225,54 +248,57 @@ static inline bool set_contains(TSCharacterRange *ranges, uint32_t len, int32_t
 
 #define ACTIONS(id) id
 
-#define SHIFT(state_value)            \
-  {{                                  \
-    .shift = {                        \
-      .type = TSParseActionTypeShift, \
-      .state = (state_value)          \
-    }                                 \
-  }}
-
-#define SHIFT_REPEAT(state_value)     \
-  {{                                  \
-    .shift = {                        \
-      .type = TSParseActionTypeShift, \
-      .state = (state_value),         \
-      .repetition = true              \
-    }                                 \
-  }}
-
-#define SHIFT_EXTRA()                 \
-  {{                                  \
-    .shift = {                        \
-      .type = TSParseActionTypeShift, \
-      .extra = true                   \
-    }                                 \
-  }}
-
-#define REDUCE(symbol_name, children, precedence, prod_id) \
-  {{                                                       \
-    .reduce = {                                            \
-      .type = TSParseActionTypeReduce,                     \
-      .symbol = symbol_name,                               \
-      .child_count = children,                             \
-      .dynamic_precedence = precedence,                    \
-      .production_id = prod_id                             \
-    },                                                     \
-  }}
-
-#define RECOVER()                    \
-  {{                                 \
-    .type = TSParseActionTypeRecover \
-  }}
-
-#define ACCEPT_INPUT()              \
-  {{                                \
-    .type = TSParseActionTypeAccept \
-  }}
+#define SHIFT(state_value)                                                    \
+  {                                                                           \
+    {                                                                         \
+      .shift = {.type = TSParseActionTypeShift, .state = (state_value) }      \
+    }                                                                         \
+  }
+
+#define SHIFT_REPEAT(state_value)                                             \
+  {                                                                           \
+    {                                                                         \
+      .shift                                                                  \
+          = {.type = TSParseActionTypeShift,                                  \
+             .state = (state_value),                                          \
+             .repetition = true }                                             \
+    }                                                                         \
+  }
+
+#define SHIFT_EXTRA()                                                         \
+  {                                                                           \
+    {                                                                         \
+      .shift = {.type = TSParseActionTypeShift, .extra = true }               \
+    }                                                                         \
+  }
+
+#define REDUCE(symbol_name, children, precedence, prod_id)                    \
+  {                                                                           \
+    {                                                                         \
+      .reduce = { .type = TSParseActionTypeReduce,                            \
+                  .symbol = symbol_name,                                      \
+                  .child_count = children,                                    \
+                  .dynamic_precedence = precedence,                           \
+                  .production_id = prod_id },                                 \
+    }                                                                         \
+  }
+
+#define RECOVER()                                                             \
+  {                                                                           \
+    {                                                                         \
+      .type = TSParseActionTypeRecover                                        \
+    }                                                                         \
+  }
+
+#define ACCEPT_INPUT()                                                        \
+  {                                                                           \
+    {                                                                         \
+      .type = TSParseActionTypeAccept                                         \
+    }                                                                         \
+  }
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // TREE_SITTER_PARSER_H_
+#endif // TREE_SITTER_PARSER_H_