tree-sitter-objectscript 1.9.10 → 1.9.11

package/core/src/node-types.json

@@ -2454,6 +2454,10 @@
         {
           "type": "method_args",
           "named": true
+        },
+        {
+          "type": "routine_ref",
+          "named": true
         }
       ]
     }
@@ -2945,10 +2949,6 @@
           "type": "label_offset",
           "named": true
         },
-        {
-          "type": "lvn",
-          "named": true
-        },
         {
           "type": "numeric_literal",
           "named": true
@@ -2961,25 +2961,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/core/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 {
@@ -3959,72 +3959,66 @@ static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE
     [0] = alias_sym_keyword_old_if,
   },
   [5] = {
-    [0] = sym_line_ref,
-  },
-  [6] = {
     [0] = alias_sym_method_name,
   },
-  [7] = {
+  [6] = {
     [0] = alias_sym_do_statement_after,
   },
-  [8] = {
+  [7] = {
     [2] = alias_sym_kill_target_list,
   },
-  [9] = {
+  [8] = {
     [2] = alias_sym_kill_target,
   },
-  [10] = {
+  [9] = {
     [2] = alias_sym_merge_argument,
   },
-  [11] = {
+  [10] = {
     [1] = alias_sym_routine_name,
   },
-  [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,
@@ -949968,12 +949962,12 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2318] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_method_args, 2, 0, 0),
   [2320] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_method_args, 3, 0, 0),
   [2322] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_method_args, 3, 0, 0),
-  [2324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 2, 0, 11),
-  [2326] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 2, 0, 11),
+  [2324] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 2, 0, 10),
+  [2326] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 2, 0, 10),
   [2328] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 2, 0, 0),
   [2330] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 2, 0, 0),
-  [2332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 16),
-  [2334] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 16),
+  [2332] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 15),
+  [2334] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 15),
   [2336] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_routine_ref, 3, 0, 0),
   [2338] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_routine_ref, 3, 0, 0),
   [2340] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_label_offset, 2, 0, 0),
@@ -950034,8 +950028,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2456] = {.entry = {.count = 1, .reusable = false}}, SHIFT(4470),
   [2458] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4471),
   [2460] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10397),
-  [2463] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollarsf, 5, 0, 22),
-  [2465] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollarsf, 5, 0, 22),
+  [2463] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollarsf, 5, 0, 21),
+  [2465] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollarsf, 5, 0, 21),
   [2467] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10168),
   [2470] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10172),
   [2473] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10245),
@@ -950158,8 +950152,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2729] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_indirection, 4, 0, 0),
   [2731] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__parenthetical_expression, 3, 0, 0),
   [2733] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__parenthetical_expression, 3, 0, 0),
-  [2735] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_method_call, 4, 0, 17),
-  [2737] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_method_call, 4, 0, 17),
+  [2735] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_class_method_call, 4, 0, 16),
+  [2737] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_class_method_call, 4, 0, 16),
   [2739] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_array_literal, 3, 0, 0),
   [2741] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_array_literal, 3, 0, 0),
   [2743] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_sql_field_reference, 5, 0, 0),
@@ -950172,8 +950166,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2757] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8011),
   [2759] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_relative_dot_method, 2, 0, 0),
   [2761] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_relative_dot_method, 2, 0, 0),
-  [2763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_method, 2, 0, 6),
-  [2765] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_method, 2, 0, 6),
+  [2763] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_method, 2, 0, 5),
+  [2765] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_method, 2, 0, 5),
   [2767] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 2, 0, 0), SHIFT_REPEAT(10473),
   [2770] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_expression_repeat1, 1, 0, 0),
   [2772] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_expression_repeat1, 1, 0, 0),
@@ -950191,16 +950185,16 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [2796] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollar_case, 6, 0, 0),
   [2798] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_array_literal, 2, 0, 0),
   [2800] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_array_literal, 2, 0, 0),
-  [2802] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extrinsic_reference, 1, 0, 5),
-  [2804] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__extrinsic_reference, 1, 0, 5),
+  [2802] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__extrinsic_reference, 1, 0, 0),
+  [2804] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__extrinsic_reference, 1, 0, 0),
   [2806] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_object_literal, 3, 0, 0),
   [2808] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_object_literal, 3, 0, 0),
   [2810] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollar_case, 7, 0, 0),
   [2812] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__dollar_case, 7, 0, 0),
   [2814] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__dollarsf_repeat1, 1, 0, 0),
   [2816] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__dollarsf_repeat1, 1, 0, 0),
-  [2818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_parameter, 2, 0, 12),
-  [2820] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_parameter, 2, 0, 12),
+  [2818] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_oref_parameter, 2, 0, 11),
+  [2820] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_oref_parameter, 2, 0, 11),
   [2822] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_json_object_literal, 2, 0, 0),
   [2824] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_json_object_literal, 2, 0, 0),
   [2826] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__dollar_text, 3, 0, 0),
@@ -950709,11 +950703,11 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [3896] = {.entry = {.count = 1, .reusable = true}}, SHIFT(748),
   [3898] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631),
   [3900] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3441),
-  [3902] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 6), SHIFT(3590),
+  [3902] = {.entry = {.count = 2, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 5), SHIFT(3590),
   [3905] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4962),
-  [3907] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 6),
+  [3907] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__text_line_ref, 1, 0, 5),
   [3909] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8060),
-  [3911] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__text_line_ref, 1, 0, 6),
+  [3911] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__text_line_ref, 1, 0, 5),
   [3913] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__dollar_list_args_repeat1, 1, 0, 0),
   [3915] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4810),
   [3917] = {.entry = {.count = 1, .reusable = false}}, SHIFT(12165),
@@ -951256,8 +951250,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5009] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_job_argument, 1, 0, 0),
   [5011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8755),
   [5013] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_job_argument, 1, 0, 0),
-  [5015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 3, 0, 18),
-  [5017] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 3, 0, 18),
+  [5015] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 3, 0, 17),
+  [5017] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 3, 0, 17),
   [5019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6921),
   [5021] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__dollarsf_repeat1, 2, 0, 0), SHIFT_REPEAT(8446),
   [5024] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_read_fchar, 1, 0, 0),
@@ -951265,8 +951259,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [5028] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_write_mnemonic, 1, 0, 0),
   [5030] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_write_mnemonic, 1, 0, 0),
   [5032] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__dollarsf_repeat1, 2, 0, 0), SHIFT_REPEAT(8595),
-  [5035] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 4, 0, 23),
-  [5037] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 4, 0, 23),
+  [5035] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__method_call, 4, 0, 22),
+  [5037] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym__method_call, 4, 0, 22),
   [5039] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_write_device_fflf_repeat1, 2, 0, 0), SHIFT_REPEAT(4034),
   [5042] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_write_device_fflf_repeat1, 2, 0, 0), SHIFT_REPEAT(4034),
   [5045] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_read_argument_repeat1, 1, 0, 0),
@@ -952045,10 +952039,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6609] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7238),
   [6611] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_if_dotted_block, 3, 0, 0),
   [6613] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_if_dotted_block, 3, 0, 0),
-  [6615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
-  [6617] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
-  [6619] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 20),
-  [6621] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 20),
+  [6615] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 18),
+  [6617] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 18),
+  [6619] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
+  [6621] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 19),
   [6623] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_lock_repeat1, 2, 0, 0),
   [6625] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_lock_repeat1, 2, 0, 0),
   [6627] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_read_variable, 3, 0, 0),
@@ -952085,8 +952079,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6690] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_job_repeat1, 2, 0, 0),
   [6692] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_job_repeat1, 2, 0, 0),
   [6694] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5230),
-  [6696] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 21),
-  [6698] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 21),
+  [6696] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 20),
+  [6698] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 20),
   [6700] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_goto_repeat1, 2, 0, 0),
   [6702] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_goto_repeat1, 2, 0, 0),
   [6704] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10452),
@@ -952144,8 +952138,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [6813] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 0),
   [6815] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_merge_repeat1, 2, 0, 0),
   [6817] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6843),
-  [6819] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 5, 0, 15),
-  [6821] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 5, 0, 15),
+  [6819] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 5, 0, 14),
+  [6821] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 5, 0, 14),
   [6823] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5765),
   [6825] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8234),
   [6827] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10754),
@@ -952252,10 +952246,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7033] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_do, 3, 0, 0),
   [7035] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_do, 3, 0, 0),
   [7037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6868),
-  [7039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 8),
-  [7041] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 8),
-  [7043] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 9),
-  [7045] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 9),
+  [7039] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 7),
+  [7041] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 7),
+  [7043] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 3, 0, 8),
+  [7045] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 3, 0, 8),
   [7047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8125),
   [7049] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock, 3, 0, 0),
   [7051] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock, 3, 0, 0),
@@ -952294,8 +952288,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7117] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_job, 3, 0, 0),
   [7119] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_job, 3, 0, 0),
   [7121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6839),
-  [7123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 3, 0, 10),
-  [7125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 3, 0, 10),
+  [7123] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 3, 0, 9),
+  [7125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 3, 0, 9),
   [7127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7974),
   [7129] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_else, 2, 0, 0),
   [7131] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_else, 2, 0, 0),
@@ -952427,23 +952421,23 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7393] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5614),
   [7395] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_zbreak, 2, 0, 0),
   [7397] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_zbreak, 2, 0, 0),
-  [7399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 8),
-  [7401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 8),
-  [7403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 9),
-  [7405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 9),
-  [7407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 13),
-  [7409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 13),
-  [7411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 14),
-  [7413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 14),
+  [7399] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 7),
+  [7401] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 7),
+  [7403] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 8),
+  [7405] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 8),
+  [7407] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 12),
+  [7409] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 12),
+  [7411] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 4, 0, 13),
+  [7413] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 4, 0, 13),
   [7415] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock, 4, 0, 0),
   [7417] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock, 4, 0, 0),
   [7419] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5615),
   [7421] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_new, 4, 0, 0),
   [7423] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_new, 4, 0, 0),
-  [7425] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 10),
-  [7427] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 10),
-  [7429] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 15),
-  [7431] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 15),
+  [7425] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 9),
+  [7427] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 9),
+  [7429] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_merge, 4, 0, 14),
+  [7431] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_merge, 4, 0, 14),
   [7433] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_xecute, 4, 0, 0),
   [7435] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_xecute, 4, 0, 0),
   [7437] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_view, 4, 0, 0),
@@ -952465,10 +952459,10 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [7471] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 0), SHIFT_REPEAT(6868),
   [7474] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 0),
   [7476] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_kill_repeat1, 2, 0, 0),
-  [7478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 13),
-  [7480] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 13),
-  [7482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 14),
-  [7484] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 14),
+  [7478] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 12),
+  [7480] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 12),
+  [7482] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_kill, 5, 0, 13),
+  [7484] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_kill, 5, 0, 13),
   [7486] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_command_lock_repeat1, 2, 0, 0), SHIFT_REPEAT(8125),
   [7489] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_lock, 5, 0, 0),
   [7491] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_lock, 5, 0, 0),
@@ -952726,8 +952720,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [8006] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8503),
   [8008] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3908),
   [8010] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3910),
-  [8012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_zbreak_arguments, 5, 0, 24),
-  [8014] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_zbreak_arguments, 5, 0, 24),
+  [8012] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_zbreak_arguments, 5, 0, 23),
+  [8014] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_zbreak_arguments, 5, 0, 23),
   [8016] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3915),
   [8018] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6913),
   [8020] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7981),
@@ -953215,8 +953209,8 @@ static const TSParseActionEntry ts_parse_actions[] = {
   [9057] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_for_dotted_block, 2, 0, 0),
   [9059] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_for_dotted_block, 5, 0, 0),
   [9061] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_for_dotted_block, 5, 0, 0),
-  [9063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 7),
-  [9065] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 7),
+  [9063] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 6),
+  [9065] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_command_do_repeat1, 1, 0, 6),
   [9067] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_command_while_dotted_block, 6, 0, 0),
   [9069] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_command_while_dotted_block, 6, 0, 0),
   [9071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3781),
@@ -957355,7 +957349,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_objectscript_core(void) {
     .metadata = {
       .major_version = 1,
       .minor_version = 9,
-      .patch_version = 10,
+      .patch_version = 11,
     },
   };
   return &language;

package/expr/grammar.js

@@ -303,7 +303,7 @@ module.exports = grammar({
     _extrinsic_reference: ($) =>
       choice(
         alias($._extrinsic_named_ref, $.line_ref),
-        alias($.routine_ref, $.line_ref),
+        $.routine_ref,
         alias($._extrinsic_indirect_ref, $.line_ref),
       ),
 

package/expr/src/node-types.json

@@ -279,6 +279,10 @@
         {
           "type": "method_args",
           "named": true
+        },
+        {
+          "type": "routine_ref",
+          "named": true
         }
       ]
     }
@@ -473,10 +477,6 @@
           "type": "label_offset",
           "named": true
         },
-        {
-          "type": "lvn",
-          "named": true
-        },
         {
           "type": "numeric_literal",
           "named": true
@@ -489,25 +489,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
         }
       ]
     }