@gram-data/tree-sitter-gram 0.3.7 → 0.3.10

package/binding.gyp

@@ -18,11 +18,17 @@
           "cflags_c": [
             "-std=c11",
           ],
+          "cflags_cc": [
+            "-std=c++20",
+          ],
         }, { # OS == "win"
           "cflags_c": [
             "/std:c11",
             "/utf-8",
           ],
+          "cflags_cc": [
+            "/std:c++20",
+          ],
         }],
       ],
     }

package/editors/zed/extension.toml

@@ -1,6 +1,6 @@
 id = "gram"
 name = "Gram Language Support"
-version = "0.3.7"
+version = "0.3.10"
 schema_version = 1
 authors = ["Gram Data Contributors"]
 description = "Support for Gram notation - composable data patterns"
@@ -12,5 +12,5 @@ capabilities = [
 
 # path = "grammars/tree-sitter-gram"
 [grammars.gram]
-repository = "https://github.com/gram-data/tree-sitter-gram"
-rev = "746afa9e990c3deca83dc2a2638877aef4bef4fa"
+repository = "file:///Users/akollegger/Developer/gram-data/tree-sitter-gram"
+rev = "v0.3.10"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gram-data/tree-sitter-gram",
-  "version": "0.3.7",
+  "version": "0.3.10",
   "description": "subject-oriented notation for structured data",
   "homepage": "https://gram-data.github.io",
   "repository": {

package/src/parser.c

@@ -4368,7 +4368,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_gram(void) {
     .metadata = {
       .major_version = 0,
       .minor_version = 3,
-      .patch_version = 7,
+      .patch_version = 10,
     },
   };
   return &language;

package/src/tree_sitter/array.h

@@ -60,7 +60,13 @@ extern "C" {
 
 /// 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((self), (void *)(self)->contents, sizeof(*self))
+#define array_delete(self)                           \
+  do {                                               \
+    if ((self)->contents) ts_free((self)->contents); \
+    (self)->contents = NULL;                         \
+    (self)->size = 0;                                \
+    (self)->capacity = 0;                            \
+  } while (0)
 
 /// Push a new `element` onto the end of the array.
 #define array_push(self, element)                                 \
@@ -130,12 +136,11 @@ extern "C" {
 /// Swap one array with another
 #define array_swap(self, 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;            \
+    void *_array_swap_tmp = (void *)(self)->contents;               \
+    (self)->contents = (other)->contents;                           \
+    (other)->contents = _array_swap_tmp;                            \
+    _array__swap(&(self)->size, &(self)->capacity,                  \
+                 &(other)->size, &(other)->capacity);               \
   } while (0)
 
 /// Get the size of the array contents
@@ -188,12 +193,6 @@ extern "C" {
 // 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(void *self, void *contents, size_t self_size) {
-  if (contents) ts_free(contents);
-  if (self) memset(self, 0, self_size);
-}
-
 /// This is not what you're looking for, see `array_erase`.
 static inline void _array__erase(void* self_contents, uint32_t *size,
                                 size_t element_size, uint32_t index) {
@@ -228,31 +227,15 @@ static inline void *_array__assign(void* self_contents, uint32_t *self_size, uin
   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 struct Swap _array__swap(void *self_contents, uint32_t *self_size, uint32_t *self_capacity,
-                               void *other_contents, uint32_t *other_size, uint32_t *other_capacity) {
-  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;
+static inline void _array__swap(uint32_t *self_size, uint32_t *self_capacity,
+                               uint32_t *other_size, uint32_t *other_capacity) {
+  uint32_t tmp_size = *self_size;
+  uint32_t tmp_capacity = *self_capacity;
+  *self_size = *other_size;
+  *self_capacity = *other_capacity;
+  *other_size = tmp_size;
+  *other_capacity = tmp_capacity;
 }
 
 /// This is not what you're looking for, see `array_push` or `array_grow_by`.

package/tree-sitter.json

@@ -12,7 +12,7 @@
     }
   ],
   "metadata": {
-    "version": "0.3.7",
+    "version": "0.3.10",
     "license": "ISC",
     "description": "subject-oriented notation for structured data",
     "links": {

package/editors/zed/languages/gram/highlights.scm

@@ -1,111 +0,0 @@
-; Strings
-(string_literal) @string
-(string_content) @string
-
-; Numbers
-(integer) @number
-(decimal) @number
-(hexadecimal) @number
-(octal) @number
-(measurement) @number
-
-; Boolean literals
-(boolean_literal) @boolean
-
-; Comment (FR-003)
-(comment) @comment
-
-; Tagged-string tag distinct from content (FR-002)
-(tagged_string tag: (symbol) @attribute)
-
-; Reference identifier: pattern_reference (FR-001)
-(pattern_reference identifier: (_) @variable)
-
-; Symbols and identifiers (generic; definition/reference/tag captured above)
-(symbol) @variable
-
-; Definition-like identifiers and labels (FR-001): @type
-; These must come AFTER generic symbol rule to take priority
-
-; Labels (symbols and quoted names in labels nodes)
-(labels (symbol) @type)
-(labels (quoted_name) @type)
-
-; Annotation identifiers and labels
-(identified_annotation identifier: (_) @type)
-(identified_annotation labels: (labels (symbol) @type))
-(identified_annotation labels: (labels (quoted_name) @type))
-
-; Subject, node, and relationship pattern definitions (FR-001): @type
-; subject/node subject is _subject (use wildcard _ as it may be hidden in some runtimes)
-(subject_pattern subject: (_ identifier: (_) @type))
-(subject_pattern subject: (_ labels: (labels (symbol) @type)))
-(subject_pattern subject: (_ labels: (labels (quoted_name) @type)))
-(node_pattern subject: (_ identifier: (_) @type))
-(node_pattern subject: (_ labels: (labels (symbol) @type)))
-(node_pattern subject: (_ labels: (labels (quoted_name) @type)))
-(relationship_pattern left: (node_pattern subject: (_ identifier: (_) @type)))
-(relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
-(relationship_pattern right: (node_pattern subject: (_ identifier: (_) @type)))
-(relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
-; Arrow kind: subject is inside optional brackets on the arrow
-(relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @type)))
-(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @type))))
-(relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @type)))
-(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @type))))
-(relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @type)))
-(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @type))))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @type)))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @type))))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @type))))
-
-; Keywords and operators
-[
-    "@"
-    "|"
-    ":"
-    "::"
-] @operator
-
-; Subject Patterns and delimiters
-[
-    "["
-    "]"
-    "("
-    ")"
-    "{"
-    "}"
-] @punctuation.bracket
-
-; Comma separator
-[
-    ","
-] @punctuation.delimiter
-
-; Field names in records and maps
-(record_property key: (symbol) @property)
-(record_property key: (quoted_name) @property)
-(record_property key: (double_quoted_name) @property)
-(map_entry key: (symbol) @property)
-(map_entry key: (quoted_name) @property)
-(map_entry key: (double_quoted_name) @property)
-
-; Annotation keys (property-style) and headers (identified/label-style)
-(property_annotation key: (symbol) @attribute)
-
-; Relationship arrows (special highlighting for graph syntax)
-(relationship_pattern) @keyword
-
-; Arrow operators in relationships
-(right_arrow) @operator
-(left_arrow) @operator
-(undirected_arrow) @operator
-(bidirectional_arrow) @operator
-
-; Error highlighting
-(ERROR) @error

package/editors/zed/languages/gram/indents.scm

@@ -1,14 +0,0 @@
-; Indentation: 2 spaces per level for brackets and multi-line structures
-; FR-007 — specs/004-editor-improvements/contracts/indents.md
-
-; Record {}
-"{" @indent
-"}" @indent.end
-
-; Subject pattern []
-"[" @indent
-"]" @indent.end
-
-; Node pattern ()
-"(" @indent
-")" @indent.end

package/editors/zed/languages/gram/injections.scm

@@ -1,29 +0,0 @@
-; Language injection for tagged strings: tag`content` and ```tag\ncontent\n```
-;
-; The tag symbol is used as the injection language so that downstream and editors
-; can support arbitrary tags without changing the grammar. Well-known tags (md, ts,
-; date, datetime, time, sql, json, html, etc.) are documented in docs/tagged-strings-and-injections.md.
-;
-; Overrides below map tags that do not match common parser names. The final
-; rule uses the tag's text as the language name for all other tags (e.g. "sql",
-; "json", "html" often match parser names).
-
-; md -> markdown
-(tagged_string
-  tag: (symbol) @_tag
-  content: (string_content) @injection.content)
-(#eq? @_tag "md")
-(#set! injection.language "markdown")
-
-; ts -> typescript
-(tagged_string
-  tag: (symbol) @_tag
-  content: (string_content) @injection.content)
-(#eq? @_tag "ts")
-(#set! injection.language "typescript")
-
-; Dynamic: use tag text as language name for all other tags (sql, json, html, etc.)
-; Editors may map additional tags (e.g. date, datetime, time) to parsers or leave as plain.
-(tagged_string
-  tag: (symbol) @injection.language
-  content: (string_content) @injection.content)

package/editors/zed/languages/gram/locals.scm

@@ -1,37 +0,0 @@
-; Locals: go to definition and highlight references (file scope)
-; FR-005, FR-006 — specs/004-editor-improvements/contracts/locals.md
-
-; File scope: all definitions and references in one scope
-(gram_pattern) @local.scope
-
-; Definitions: identifiers that define a pattern or annotation
-(subject_pattern subject: (_ identifier: (_) @local.definition))
-(subject_pattern subject: (_ labels: (labels (symbol) @local.definition)))
-(subject_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
-(node_pattern subject: (_ identifier: (_) @local.definition))
-(node_pattern subject: (_ labels: (labels (symbol) @local.definition)))
-(node_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
-(relationship_pattern left: (node_pattern subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
-(relationship_pattern right: (node_pattern subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
-(relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
-(relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
-(relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @local.definition)))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @local.definition))))
-(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
-(identified_annotation identifier: (_) @local.definition)
-(identified_annotation labels: (labels (symbol) @local.definition))
-(identified_annotation labels: (labels (quoted_name) @local.definition))
-
-; References: pattern_reference identifier
-(pattern_reference identifier: (_) @local.reference)