tree-sitter-objectscript 1.9.10 → 1.9.11

package/objectscript_routine/src/node-types.json

@@ -2460,6 +2460,10 @@
         {
           "type": "method_args",
           "named": true
+        },
+        {
+          "type": "routine_ref",
+          "named": true
         }
       ]
     }
@@ -2951,10 +2955,6 @@
           "type": "label_offset",
           "named": true
         },
-        {
-          "type": "lvn",
-          "named": true
-        },
         {
           "type": "numeric_literal",
           "named": true
@@ -2967,25 +2967,9 @@
           "type": "objectscript_identifier_special",
           "named": true
         },
-        {
-          "type": "routine_name",
-          "named": true
-        },
         {
           "type": "routine_ref",
           "named": true
-        },
-        {
-          "type": "string_literal",
-          "named": true
-        },
-        {
-          "type": "system_defined_function",
-          "named": true
-        },
-        {
-          "type": "system_defined_variable",
-          "named": true
         }
       ]
     }

package/objectscript_routine/src/parser.c

@@ -24,7 +24,7 @@
 #define FIELD_COUNT 0
 #define MAX_ALIAS_SEQUENCE_LENGTH 10
 #define MAX_RESERVED_WORD_SET_SIZE 0
-#define PRODUCTION_ID_COUNT 25
+#define PRODUCTION_ID_COUNT 24
 #define SUPERTYPE_COUNT 0
 
 enum ts_symbol_identifiers {
@@ -4039,69 +4039,63 @@ static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE
     [0] = alias_sym_keyword_old_if,
   },
   [6] = {
-    [0] = sym_line_ref,
-  },
-  [7] = {
     [0] = alias_sym_method_name,
   },
-  [8] = {
+  [7] = {
     [0] = alias_sym_do_statement_after,
   },
-  [9] = {
+  [8] = {
     [2] = alias_sym_kill_target_list,
   },
-  [10] = {
+  [9] = {
     [2] = alias_sym_kill_target,
   },
-  [11] = {
+  [10] = {
     [2] = alias_sym_merge_argument,
   },
-  [12] = {
+  [11] = {
     [1] = alias_sym_parameter_name,
   },
-  [13] = {
+  [12] = {
     [3] = alias_sym_kill_target_list,
   },
-  [14] = {
+  [13] = {
     [3] = alias_sym_kill_target,
   },
-  [15] = {
+  [14] = {
     [3] = alias_sym_merge_argument,
   },
-  [16] = {
+  [15] = {
     [2] = alias_sym_routine_name,
   },
-  [17] = {
+  [16] = {
     [2] = alias_sym_method_name,
   },
-  [18] = {
+  [17] = {
     [1] = alias_sym_method_dot,
   },
-  [19] = {
+  [18] = {
     [1] = alias_sym_kill_target_list,
   },
-  [20] = {
+  [19] = {
     [1] = alias_sym_kill_target,
   },
-  [21] = {
+  [20] = {
     [1] = alias_sym_merge_argument,
   },
-  [22] = {
+  [21] = {
     [1] = sym__quote_permitting_identifier,
     [3] = alias_sym_method_name,
   },
-  [23] = {
+  [22] = {
     [2] = alias_sym_method_dot,
   },
-  [24] = {
+  [23] = {
     [4] = sym_keyword_normal,
   },
 };
 
 static const uint16_t ts_non_terminal_alias_map[] = {
-  sym_routine_ref, 2,
-    sym_routine_ref,
-    sym_line_ref,
   sym__member_name, 3,
     sym__member_name,
     alias_sym_method_name,
@@ -996433,8 +996427,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2522] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 2, 0, 1),
   [2524] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 2, 0, 0),
   [2526] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 2, 0, 0),
-  [2528] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 16),
-  [2530] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 16),
+  [2528] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 15),
+  [2530] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 15),
   [2532] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 0),
   [2534] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 0),
   [2536] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_label_offset, 2, 0, 0),
@@ -996490,8 +996484,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2642] = {.entry = {.count = 1, .reusable = false}}, SHIFT(4473),
   [2644] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4474),
   [2646] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(9598),
-  [2649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollarsf, 5, 0, 22),
-  [2651] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollarsf, 5, 0, 22),
+  [2649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollarsf, 5, 0, 21),
+  [2651] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollarsf, 5, 0, 21),
   [2653] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10180),
   [2656] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10184),
   [2659] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3593),
@@ -996642,8 +996636,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2971] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollar_mv, 4, 0, 0),
   [2973] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parenthetical_expression, 3, 0, 0),
   [2975] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__parenthetical_expression, 3, 0, 0),
-  [2977] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_method, 2, 0, 7),
-  [2979] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_method, 2, 0, 7),
+  [2977] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_method, 2, 0, 6),
+  [2979] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_method, 2, 0, 6),
   [2981] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(9756),
   [2984] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 1, 0, 0),
   [2986] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_expression_repeat1, 1, 0, 0),
@@ -996663,12 +996657,12 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3014] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollar_method, 4, 0, 0),
   [3016] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_array_literal, 2, 0, 0),
   [3018] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_array_literal, 2, 0, 0),
-  [3020] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extrinsic_reference, 1, 0, 6),
-  [3022] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__extrinsic_reference, 1, 0, 6),
+  [3020] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extrinsic_reference, 1, 0, 0),
+  [3022] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__extrinsic_reference, 1, 0, 0),
   [3024] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_indirection, 4, 0, 0),
   [3026] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_indirection, 4, 0, 0),
-  [3028] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_method_call, 4, 0, 17),
-  [3030] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_method_call, 4, 0, 17),
+  [3028] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_method_call, 4, 0, 16),
+  [3030] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_method_call, 4, 0, 16),
   [3032] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_system_defined_function, 1, 0, 0),
   [3034] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_system_defined_function, 1, 0, 0),
   [3036] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_object_literal, 2, 0, 0),
@@ -996689,8 +996683,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3066] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sql_field_reference, 3, 0, 0),
   [3068] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_object_literal, 3, 0, 0),
   [3070] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_object_literal, 3, 0, 0),
-  [3072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_parameter, 2, 0, 12),
-  [3074] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_parameter, 2, 0, 12),
+  [3072] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_parameter, 2, 0, 11),
+  [3074] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_parameter, 2, 0, 11),
   [3076] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sql_field_reference, 5, 0, 0),
   [3078] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_sql_field_reference, 5, 0, 0),
   [3080] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extrinsic_named_ref, 3, 0, 0),
@@ -997167,11 +997161,11 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [4086] = {.entry = {.count = 1, .reusable = true}}, SHIFT(947),
   [4088] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8784),
   [4090] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3445),
-  [4092] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 7), SHIFT(3539),
+  [4092] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 6), SHIFT(3539),
   [4095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5505),
-  [4097] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 7),
+  [4097] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 6),
   [4099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8007),
-  [4101] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__text_line_ref, 1, 0, 7),
+  [4101] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__text_line_ref, 1, 0, 6),
   [4103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3995),
   [4105] = {.entry = {.count = 1, .reusable = false}}, SHIFT(12009),
   [4107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3510),
@@ -997643,8 +997637,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5055] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_variable_datatype, 2, 0, 0),
   [5057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_variable_datatype, 2, 0, 0),
   [5059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8499),
-  [5061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 4, 0, 23),
-  [5063] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 4, 0, 23),
+  [5061] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 4, 0, 22),
+  [5063] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 4, 0, 22),
   [5065] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_write_device_fflf, 1, 0, 0),
   [5067] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_write_device_fflf, 1, 0, 0),
   [5069] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_read_fchar, 1, 0, 0),
@@ -997658,8 +997652,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5087] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_mnemonic_name, 2, 0, 0),
   [5089] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_mnemonic_name, 2, 0, 0),
   [5091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8620),
-  [5093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 3, 0, 18),
-  [5095] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 3, 0, 18),
+  [5093] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 3, 0, 17),
+  [5095] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 3, 0, 17),
   [5097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5792),
   [5099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5995),
   [5101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8246),
@@ -998110,10 +998104,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6009] = {.entry = {.count = 1, .reusable = false}}, SHIFT(5707),
   [6011] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__target_var_arg, 1, 0, 0),
   [6013] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__target_var_arg, 1, 0, 0),
-  [6015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
-  [6017] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
-  [6019] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 20),
-  [6021] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 20),
+  [6015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 18),
+  [6017] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 18),
+  [6019] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
+  [6021] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
   [6023] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock_argument, 3, 0, 0),
   [6025] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock_argument, 3, 0, 0),
   [6027] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_lock_repeat1, 2, 0, 0),
@@ -998223,8 +998217,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6237] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_write_device_fflf_repeat1, 2, 0, 0), SHIFT_REPEAT(4846),
   [6240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_job_repeat1, 2, 0, 0),
   [6242] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_job_repeat1, 2, 0, 0),
-  [6244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 21),
-  [6246] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 21),
+  [6244] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 20),
+  [6246] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 20),
   [6248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_goto_repeat1, 2, 0, 0),
   [6250] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_goto_repeat1, 2, 0, 0),
   [6252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_xecute_repeat1, 2, 0, 0),
@@ -998604,10 +998598,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7006] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 0),
   [7008] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 0),
   [7010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6873),
-  [7012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 13),
-  [7014] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 13),
-  [7016] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 14),
-  [7018] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 14),
+  [7012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 12),
+  [7014] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 12),
+  [7016] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 13),
+  [7018] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 13),
   [7020] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_for, 2, 0, 4),
   [7022] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_for, 2, 0, 4),
   [7024] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_lock_repeat1, 2, 0, 0), SHIFT_REPEAT(8138),
@@ -998653,8 +998647,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7109] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 0),
   [7111] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 0),
   [7113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6855),
-  [7115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 5, 0, 15),
-  [7117] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 5, 0, 15),
+  [7115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 5, 0, 14),
+  [7117] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 5, 0, 14),
   [7119] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_xecute_repeat1, 2, 0, 0), SHIFT_REPEAT(4199),
   [7122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4199),
   [7124] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_xecute, 5, 0, 0),
@@ -998738,10 +998732,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7283] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_zz, 3, 0, 0),
   [7285] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_zz, 3, 0, 0),
   [7287] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6885),
-  [7289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 9),
-  [7291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 9),
-  [7293] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 10),
-  [7295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 10),
+  [7289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 8),
+  [7291] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 8),
+  [7293] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 9),
+  [7295] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 9),
   [7297] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8145),
   [7299] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock, 3, 0, 0),
   [7301] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock, 3, 0, 0),
@@ -998776,8 +998770,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7359] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_job, 3, 0, 0),
   [7361] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_job, 3, 0, 0),
   [7363] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6859),
-  [7365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 3, 0, 11),
-  [7367] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 3, 0, 11),
+  [7365] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 3, 0, 10),
+  [7367] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 3, 0, 10),
   [7369] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7985),
   [7371] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_new, 2, 0, 0),
   [7373] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_new, 2, 0, 0),
@@ -998911,23 +998905,23 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7639] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_trollback, 2, 0, 0),
   [7641] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_tstart, 2, 0, 0),
   [7643] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_tstart, 2, 0, 0),
-  [7645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 9),
-  [7647] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 9),
-  [7649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 10),
-  [7651] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 10),
-  [7653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 13),
-  [7655] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 13),
-  [7657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 14),
-  [7659] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 14),
+  [7645] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 8),
+  [7647] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 8),
+  [7649] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 9),
+  [7651] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 9),
+  [7653] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 12),
+  [7655] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 12),
+  [7657] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 13),
+  [7659] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 13),
   [7661] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock, 4, 0, 0),
   [7663] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock, 4, 0, 0),
   [7665] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5658),
   [7667] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_new, 4, 0, 0),
   [7669] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_new, 4, 0, 0),
-  [7671] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 11),
-  [7673] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 11),
-  [7675] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 15),
-  [7677] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 15),
+  [7671] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 10),
+  [7673] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 10),
+  [7675] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 14),
+  [7677] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 14),
   [7679] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_xecute, 4, 0, 0),
   [7681] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_xecute, 4, 0, 0),
   [7683] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_view, 4, 0, 0),
@@ -999217,8 +999211,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [8272] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4432),
   [8274] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4705),
   [8276] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5583),
-  [8278] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_zbreak_arguments, 5, 0, 24),
-  [8280] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_zbreak_arguments, 5, 0, 24),
+  [8278] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_zbreak_arguments, 5, 0, 23),
+  [8280] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_zbreak_arguments, 5, 0, 23),
   [8282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__zb_device, 2, 0, 0),
   [8284] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__zb_device, 2, 0, 0),
   [8286] = {.entry = {.count = 1, .reusable = false}}, SHIFT(8604),
@@ -999687,8 +999681,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [9275] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_type, 5, 0, 0),
   [9277] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_for_dotted_block, 2, 0, 0),
   [9279] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_for_dotted_block, 2, 0, 0),
-  [9281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 8),
-  [9283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 8),
+  [9281] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 7),
+  [9283] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 7),
   [9285] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_trycatch_dotted, 5, 0, 0),
   [9287] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_trycatch_dotted, 5, 0, 0),
   [9289] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_trycatch_dotted, 4, 0, 0),
@@ -1003900,7 +1003894,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_routine(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 10,
+      .patch_version = 11,
     },
   };
   return &language;

package/package.json

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

package/tree-sitter.json

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

package/udl/src/node-types.json

@@ -2791,6 +2791,10 @@
         {
           "type": "method_args",
           "named": true
+        },
+        {
+          "type": "routine_ref",
+          "named": true
         }
       ]
     }
@@ -3597,10 +3601,6 @@
           "type": "label_offset",
           "named": true
         },
-        {
-          "type": "lvn",
-          "named": true
-        },
         {
           "type": "numeric_literal",
           "named": true
@@ -3613,25 +3613,9 @@
           "type": "objectscript_identifier_special",
           "named": true
         },
-        {
-          "type": "routine_name",
-          "named": true
-        },
         {
           "type": "routine_ref",
           "named": true
-        },
-        {
-          "type": "string_literal",
-          "named": true
-        },
-        {
-          "type": "system_defined_function",
-          "named": true
-        },
-        {
-          "type": "system_defined_variable",
-          "named": true
         }
       ]
     }