tree-sitter-objectscript 1.9.5 → 1.9.6

package/objectscript_routine/src/parser.c

@@ -133,7 +133,7 @@ enum ts_symbol_identifiers {
   anon_sym_false = 103,
   sym_json_null_literal = 104,
   sym_identifier = 105,
-  aux_sym_quote_permitting_identifier_token1 = 106,
+  aux_sym__quote_permitting_identifier_token1 = 106,
   anon_sym_SLASH_SLASH = 107,
   anon_sym_POUND_SEMI = 108,
   anon_sym_SEMI = 109,
@@ -379,7 +379,7 @@ enum ts_symbol_identifiers {
   sym_json_array_literal = 349,
   sym_json_boolean_literal = 350,
   sym__expression_list = 351,
-  sym_quote_permitting_identifier = 352,
+  sym__quote_permitting_identifier = 352,
   sym_line_comment_1 = 353,
   sym_line_comment_2 = 354,
   sym_line_comment_3 = 355,
@@ -713,7 +713,7 @@ static const char * const ts_symbol_names[] = {
   [anon_sym_false] = "false",
   [sym_json_null_literal] = "json_null_literal",
   [sym_identifier] = "identifier",
-  [aux_sym_quote_permitting_identifier_token1] = "quote_permitting_identifier_token1",
+  [aux_sym__quote_permitting_identifier_token1] = "identifier",
   [anon_sym_SLASH_SLASH] = "//",
   [anon_sym_POUND_SEMI] = "#;",
   [anon_sym_SEMI] = ";",
@@ -959,7 +959,7 @@ static const char * const ts_symbol_names[] = {
   [sym_json_array_literal] = "json_array_literal",
   [sym_json_boolean_literal] = "json_boolean_literal",
   [sym__expression_list] = "_expression_list",
-  [sym_quote_permitting_identifier] = "class_name",
+  [sym__quote_permitting_identifier] = "class_name",
   [sym_line_comment_1] = "line_comment_1",
   [sym_line_comment_2] = "line_comment_2",
   [sym_line_comment_3] = "line_comment_3",
@@ -1293,7 +1293,7 @@ static const TSSymbol ts_symbol_map[] = {
   [anon_sym_false] = anon_sym_false,
   [sym_json_null_literal] = sym_json_null_literal,
   [sym_identifier] = sym_identifier,
-  [aux_sym_quote_permitting_identifier_token1] = aux_sym_quote_permitting_identifier_token1,
+  [aux_sym__quote_permitting_identifier_token1] = sym_identifier,
   [anon_sym_SLASH_SLASH] = anon_sym_SLASH_SLASH,
   [anon_sym_POUND_SEMI] = anon_sym_POUND_SEMI,
   [anon_sym_SEMI] = anon_sym_SEMI,
@@ -1539,7 +1539,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_json_array_literal] = sym_json_array_literal,
   [sym_json_boolean_literal] = sym_json_boolean_literal,
   [sym__expression_list] = sym__expression_list,
-  [sym_quote_permitting_identifier] = sym_class_name,
+  [sym__quote_permitting_identifier] = sym_class_name,
   [sym_line_comment_1] = sym_line_comment_1,
   [sym_line_comment_2] = sym_line_comment_2,
   [sym_line_comment_3] = sym_line_comment_3,
@@ -2191,9 +2191,9 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [aux_sym_quote_permitting_identifier_token1] = {
-    .visible = false,
-    .named = false,
+  [aux_sym__quote_permitting_identifier_token1] = {
+    .visible = true,
+    .named = true,
   },
   [anon_sym_SLASH_SLASH] = {
     .visible = true,
@@ -3175,7 +3175,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = false,
     .named = true,
   },
-  [sym_quote_permitting_identifier] = {
+  [sym__quote_permitting_identifier] = {
     .visible = true,
     .named = true,
   },
@@ -32981,7 +32981,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
           ('a' <= lookahead && lookahead <= 'z')) ADVANCE(1638);
       END_STATE();
     case 1639:
-      ACCEPT_TOKEN(aux_sym_quote_permitting_identifier_token1);
+      ACCEPT_TOKEN(aux_sym__quote_permitting_identifier_token1);
       if (lookahead == '"') ADVANCE(85);
       END_STATE();
     case 1640:
@@ -934123,10 +934123,10 @@ static const uint16_t ts_small_parse_table[] = {
     ACTIONS(13), 1,
       anon_sym_SLASH_SLASH_SLASH,
     STATE(11603), 1,
-      sym_quote_permitting_identifier,
+      sym__quote_permitting_identifier,
     ACTIONS(13125), 2,
       sym_identifier,
-      aux_sym_quote_permitting_identifier_token1,
+      aux_sym__quote_permitting_identifier_token1,
     ACTIONS(15), 4,
       sym__whitespace,
       sym_inline_comment,
@@ -1008792,7 +1008792,7 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [15668] = {.entry = {.count = 1, .reusable = true}}, SHIFT(1660),
   [15670] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12220),
   [15672] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7812),
-  [15674] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_quote_permitting_identifier, 1, 0, 0),
+  [15674] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__quote_permitting_identifier, 1, 0, 0),
   [15676] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11206),
   [15678] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11215),
   [15680] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7603),
@@ -1009897,7 +1009897,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_routine(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 5,
+      .patch_version = 6,
     },
   };
   return &language;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-objectscript",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "description": "Tree Sitter Grammar for InterSystems ObjectScript",
   "scripts": {
     "install": "node-gyp-build",

package/tree-sitter.json

@@ -56,7 +56,7 @@
     }
   ],
   "metadata": {
-    "version": "1.9.5",
+    "version": "1.9.6",
     "license": "MIT",
     "description": "ObjectScript grammars for tree-sitter",
     "namespace": "io.github.treesitter.objectscript",

package/udl/grammar.js

@@ -7,7 +7,6 @@
  *
  */
 
-
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 const keyword_rules = require('../common/keywords');
@@ -65,7 +64,7 @@ module.exports = define_grammar(objectscript_core, {
     class_definition: ($) =>
       seq(
         $.keyword_class,
-        alias($.quote_permitting_identifier, $.class_name),
+        alias($._quote_permitting_identifier, $.class_name),
         optional($.class_extends),
         optional($.class_keywords),
         $.class_body,
@@ -115,7 +114,7 @@ module.exports = define_grammar(objectscript_core, {
     query: ($) =>
       seq(
         $.keyword_query,
-        alias($.quote_permitting_identifier, $.query_name),
+        alias($._quote_permitting_identifier, $.query_name),
         $.arguments,
         $.return_type,
         optional($.query_keywords),
@@ -132,7 +131,7 @@ module.exports = define_grammar(objectscript_core, {
     trigger: ($) =>
       seq(
         $.keyword_trigger,
-        alias($.quote_permitting_identifier, $.trigger_name),
+        alias($._quote_permitting_identifier, $.trigger_name),
         choice($.core_trigger, $.external_trigger),
       ),
 
@@ -149,7 +148,7 @@ module.exports = define_grammar(objectscript_core, {
     property: ($) =>
       seq(
         $.keyword_property,
-        alias($.quote_permitting_identifier, $.property_name),
+        alias($._quote_permitting_identifier, $.property_name),
         optional($.return_type),
         optional($.property_keywords),
         ';',
@@ -158,7 +157,7 @@ module.exports = define_grammar(objectscript_core, {
     relationship: ($) =>
       seq(
         alias(/Relationship/i, $.keyword_relationship),
-        alias($.quote_permitting_identifier, $.relationship_name),
+        alias($._quote_permitting_identifier, $.relationship_name),
         optional($.return_type),
         $.relationship_keywords,
         ';',
@@ -167,17 +166,19 @@ module.exports = define_grammar(objectscript_core, {
     foreignkey: ($) =>
       seq(
         $.keyword_foreignkey,
-        alias($.quote_permitting_identifier, $.foreignkey_name),
+        alias($._quote_permitting_identifier, $.foreignkey_name),
         alias(token.immediate('('), $.bracket),
-        alias($.quote_permitting_identifier, $.property_name),
-        repeat(seq(',', alias($.quote_permitting_identifier, $.property_name))),
+        alias($._quote_permitting_identifier, $.property_name),
+        repeat(
+          seq(',', alias($._quote_permitting_identifier, $.property_name)),
+        ),
         alias(token.immediate(')'), $.bracket),
         $.keyword_references,
-        alias($.quote_permitting_identifier, $.class_name),
+        alias($._quote_permitting_identifier, $.class_name),
         optional(
           seq(
             alias('(', $.bracket),
-            alias($.quote_permitting_identifier, $.index_name),
+            alias($._quote_permitting_identifier, $.index_name),
             alias(')', $.bracket),
           ),
         ),
@@ -206,7 +207,7 @@ module.exports = define_grammar(objectscript_core, {
     parameter: ($) =>
       seq(
         $.keyword_parameter,
-        alias($.quote_permitting_identifier, $.parameter_name),
+        alias($._quote_permitting_identifier, $.parameter_name),
         optional($.parameter_type),
         optional($.parameter_keywords),
         optional(seq('=', $.default_argument_value)),
@@ -216,7 +217,7 @@ module.exports = define_grammar(objectscript_core, {
     projection: ($) =>
       seq(
         $.keyword_projection,
-        alias($.quote_permitting_identifier, $.projection_name),
+        alias($._quote_permitting_identifier, $.projection_name),
         $.return_type,
         optional($.projection_keywords),
         ';',
@@ -226,14 +227,14 @@ module.exports = define_grammar(objectscript_core, {
       choice(
         seq(
           $.keyword_index,
-          alias($.quote_permitting_identifier, $.index_name),
+          alias($._quote_permitting_identifier, $.index_name),
           seq($.keyword_on, $.index_properties),
           optional($.index_keywords),
           ';',
         ),
         seq(
           $.keyword_index,
-          alias($.quote_permitting_identifier, $.index_name),
+          alias($._quote_permitting_identifier, $.index_name),
           $.extent_index_keywords,
           ';',
         ),
@@ -248,7 +249,7 @@ module.exports = define_grammar(objectscript_core, {
       seq($.index_property, optional(seq($.keyword_as, $.index_type))),
     index_property: ($) =>
       seq(
-        $.quote_permitting_identifier,
+        $._quote_permitting_identifier,
         optional(
           seq(
             alias('(', $.bracket),
@@ -278,7 +279,7 @@ module.exports = define_grammar(objectscript_core, {
     xdata: ($) =>
       seq(
         $.keyword_xdata,
-        alias($.quote_permitting_identifier, $.xdata_name),
+        alias($._quote_permitting_identifier, $.xdata_name),
         choice($.xdata_xml, $.xdata_any),
       ),
 
@@ -296,14 +297,14 @@ module.exports = define_grammar(objectscript_core, {
     storage: ($) =>
       seq(
         $.keyword_storage,
-        alias($.quote_permitting_identifier, $.storage_name),
+        alias($._quote_permitting_identifier, $.storage_name),
         optional($.storage_keywords),
         $.storage_body,
       ),
 
     method_definition: ($) =>
       seq(
-        alias($.quote_permitting_identifier, $.method_name),
+        alias($._quote_permitting_identifier, $.method_name),
         $.arguments,
         optional($.return_type),
         choice(

package/udl/src/node-types.json

@@ -3236,7 +3236,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -3508,7 +3508,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -3545,11 +3545,11 @@
           "named": true
         },
         {
-          "type": "index_property_type",
+          "type": "identifier",
           "named": true
         },
         {
-          "type": "quote_permitting_identifier",
+          "type": "index_property_type",
           "named": true
         }
       ]
@@ -4854,7 +4854,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -5450,7 +5450,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -5690,21 +5690,6 @@
       ]
     }
   },
-  {
-    "type": "quote_permitting_identifier",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "quoted_member_name",
     "named": true,
@@ -5842,7 +5827,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -6735,7 +6720,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",
@@ -7137,7 +7122,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",