From f8de25f30757a2def006a7c144354710fe63dcf3 Mon Sep 17 00:00:00 2001 From: Uy Ha Date: Thu, 22 Feb 2024 06:35:15 +0000 Subject: [PATCH] chore: generate with tree-sitter 0.21.0 --- src/grammar.json | 1 - src/parser.c | 2489 +++++++++++++++++++------------------- src/tree_sitter/parser.h | 16 +- 3 files changed, 1241 insertions(+), 1265 deletions(-) diff --git a/src/grammar.json b/src/grammar.json index 64b3080..ab2ab9a 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -1205,4 +1205,3 @@ "inline": [], "supertypes": [] } - diff --git a/src/parser.c b/src/parser.c index fdee3a1..bc78544 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,4 +1,4 @@ -#include +#include "tree_sitter/parser.h" #if defined(__GNUC__) || defined(__clang__) #pragma GCC diagnostic push @@ -16,7 +16,7 @@ #define MAX_ALIAS_SEQUENCE_LENGTH 7 #define PRODUCTION_ID_COUNT 1 -enum { +enum ts_symbol_identifiers { sym__escape_identity = 1, anon_sym_BSLASHt = 2, anon_sym_BSLASHr = 3, @@ -747,23 +747,23 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = { [22] = 16, [23] = 23, [24] = 18, - [25] = 25, - [26] = 17, + [25] = 17, + [26] = 26, [27] = 19, [28] = 20, [29] = 21, [30] = 16, - [31] = 25, + [31] = 17, [32] = 18, [33] = 20, - [34] = 17, - [35] = 25, + [34] = 26, + [35] = 17, [36] = 23, [37] = 37, [38] = 38, [39] = 38, [40] = 16, - [41] = 17, + [41] = 26, [42] = 23, [43] = 23, [44] = 38, @@ -775,42 +775,42 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = { [50] = 18, [51] = 37, [52] = 18, - [53] = 18, - [54] = 16, - [55] = 19, - [56] = 20, - [57] = 21, - [58] = 25, - [59] = 37, + [53] = 16, + [54] = 19, + [55] = 20, + [56] = 21, + [57] = 17, + [58] = 37, + [59] = 20, [60] = 19, - [61] = 25, + [61] = 37, [62] = 21, - [63] = 20, - [64] = 37, - [65] = 65, + [63] = 63, + [64] = 26, + [65] = 38, [66] = 19, - [67] = 17, - [68] = 38, + [67] = 23, + [68] = 23, [69] = 69, - [70] = 23, + [70] = 38, [71] = 21, - [72] = 38, - [73] = 25, + [72] = 37, + [73] = 17, [74] = 74, [75] = 20, [76] = 16, - [77] = 37, - [78] = 17, - [79] = 16, - [80] = 20, - [81] = 25, - [82] = 17, + [77] = 26, + [78] = 16, + [79] = 20, + [80] = 17, + [81] = 21, + [82] = 26, [83] = 23, - [84] = 21, + [84] = 18, [85] = 19, - [86] = 23, - [87] = 38, - [88] = 37, + [86] = 26, + [87] = 37, + [88] = 38, [89] = 89, [90] = 90, [91] = 91, @@ -832,51 +832,51 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = { [107] = 107, [108] = 108, [109] = 109, - [110] = 110, + [110] = 109, [111] = 111, - [112] = 110, + [112] = 112, [113] = 113, - [114] = 114, - [115] = 114, - [116] = 110, - [117] = 111, - [118] = 109, - [119] = 113, - [120] = 114, - [121] = 107, - [122] = 107, - [123] = 114, - [124] = 110, - [125] = 109, - [126] = 111, + [114] = 113, + [115] = 112, + [116] = 111, + [117] = 109, + [118] = 118, + [119] = 112, + [120] = 107, + [121] = 111, + [122] = 118, + [123] = 107, + [124] = 112, + [125] = 111, + [126] = 118, [127] = 107, - [128] = 109, - [129] = 111, + [128] = 118, + [129] = 108, [130] = 108, - [131] = 108, - [132] = 113, + [131] = 109, + [132] = 109, [133] = 107, - [134] = 113, - [135] = 107, - [136] = 110, - [137] = 107, - [138] = 114, - [139] = 108, - [140] = 111, + [134] = 107, + [135] = 111, + [136] = 107, + [137] = 118, + [138] = 113, + [139] = 113, + [140] = 112, [141] = 111, [142] = 109, - [143] = 113, - [144] = 114, - [145] = 111, - [146] = 110, - [147] = 109, - [148] = 110, - [149] = 109, - [150] = 113, - [151] = 151, - [152] = 114, + [143] = 118, + [144] = 112, + [145] = 113, + [146] = 112, + [147] = 113, + [148] = 108, + [149] = 113, + [150] = 150, + [151] = 118, + [152] = 109, [153] = 108, - [154] = 113, + [154] = 111, [155] = 108, [156] = 156, [157] = 157, @@ -1613,8 +1613,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { if (lookahead == '{') ADVANCE(34); if (lookahead == '\t' || lookahead == ' ') ADVANCE(42); - if (lookahead == '\n' || - lookahead == '\r') ADVANCE(42); + if (('\n' <= lookahead && lookahead <= '\r')) ADVANCE(42); if (lookahead != 0 && lookahead != '#') ADVANCE(49); END_STATE(); @@ -1629,9 +1628,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { if (lookahead == 'E') ADVANCE(51); if (lookahead == '\\') ADVANCE(13); if (lookahead == '{') ADVANCE(34); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (lookahead != 0 && lookahead != '#') ADVANCE(49); @@ -1643,9 +1640,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { if (lookahead == ')') ADVANCE(44); if (lookahead == ';') ADVANCE(30); if (lookahead == '\\') ADVANCE(13); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (lookahead != 0 && lookahead != '#') ADVANCE(49); @@ -1808,9 +1803,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1829,9 +1822,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1850,9 +1841,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1871,9 +1860,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1892,9 +1879,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1913,9 +1898,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -1934,9 +1917,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { lookahead == 'm') ADVANCE(72); if (lookahead == 'W' || lookahead == 'w') ADVANCE(101); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(42); if (('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -2029,9 +2010,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { END_STATE(); case 52: ACCEPT_TOKEN(aux_sym__unquoted_text_token1); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(57); END_STATE(); case 53: @@ -2046,9 +2025,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { if (lookahead == 'E') ADVANCE(51); if (lookahead == '\\') ADVANCE(13); if (lookahead == '{') ADVANCE(34); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(52); if (lookahead != 0 && lookahead != '"' && @@ -2061,9 +2038,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { if (lookahead == '$') ADVANCE(33); if (lookahead == ';') ADVANCE(30); if (lookahead == '\\') ADVANCE(13); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(52); if (lookahead != 0 && lookahead != '"' && @@ -2074,16 +2049,12 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { case 56: ACCEPT_TOKEN(aux_sym_endwhile_command_token1); if (lookahead == ')') ADVANCE(44); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(57); END_STATE(); case 57: ACCEPT_TOKEN(aux_sym_endwhile_command_token1); - if (lookahead == '\t' || - lookahead == '\n' || - lookahead == '\r' || + if (('\t' <= lookahead && lookahead <= '\r') || lookahead == ' ') ADVANCE(57); END_STATE(); case 58: @@ -2306,7 +2277,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { case 85: ACCEPT_TOKEN(sym_identifier); if (lookahead == 'D' || - lookahead == 'd') ADVANCE(76); + lookahead == 'd') ADVANCE(143); if (('0' <= lookahead && lookahead <= '9') || ('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -2315,7 +2286,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) { case 86: ACCEPT_TOKEN(sym_identifier); if (lookahead == 'D' || - lookahead == 'd') ADVANCE(143); + lookahead == 'd') ADVANCE(76); if (('0' <= lookahead && lookahead <= '9') || ('A' <= lookahead && lookahead <= 'Z') || lookahead == '_' || @@ -2971,26 +2942,26 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [117] = {.lex_state = 24, .external_lex_state = 2}, [118] = {.lex_state = 24, .external_lex_state = 2}, [119] = {.lex_state = 24, .external_lex_state = 2}, - [120] = {.lex_state = 24, .external_lex_state = 2}, - [121] = {.lex_state = 19, .external_lex_state = 2}, - [122] = {.lex_state = 20, .external_lex_state = 2}, - [123] = {.lex_state = 24, .external_lex_state = 2}, + [120] = {.lex_state = 19, .external_lex_state = 2}, + [121] = {.lex_state = 24, .external_lex_state = 2}, + [122] = {.lex_state = 24, .external_lex_state = 2}, + [123] = {.lex_state = 20, .external_lex_state = 2}, [124] = {.lex_state = 24, .external_lex_state = 2}, [125] = {.lex_state = 24, .external_lex_state = 2}, [126] = {.lex_state = 24, .external_lex_state = 2}, [127] = {.lex_state = 21, .external_lex_state = 2}, [128] = {.lex_state = 24, .external_lex_state = 2}, - [129] = {.lex_state = 24, .external_lex_state = 2}, + [129] = {.lex_state = 19, .external_lex_state = 2}, [130] = {.lex_state = 21, .external_lex_state = 2}, - [131] = {.lex_state = 20, .external_lex_state = 2}, + [131] = {.lex_state = 24, .external_lex_state = 2}, [132] = {.lex_state = 24, .external_lex_state = 2}, [133] = {.lex_state = 22, .external_lex_state = 2}, - [134] = {.lex_state = 24, .external_lex_state = 2}, - [135] = {.lex_state = 23, .external_lex_state = 2}, + [134] = {.lex_state = 23, .external_lex_state = 2}, + [135] = {.lex_state = 24, .external_lex_state = 2}, [136] = {.lex_state = 24, .external_lex_state = 2}, [137] = {.lex_state = 24, .external_lex_state = 2}, [138] = {.lex_state = 24, .external_lex_state = 2}, - [139] = {.lex_state = 23, .external_lex_state = 2}, + [139] = {.lex_state = 24, .external_lex_state = 2}, [140] = {.lex_state = 24, .external_lex_state = 2}, [141] = {.lex_state = 24, .external_lex_state = 2}, [142] = {.lex_state = 24, .external_lex_state = 2}, @@ -2999,12 +2970,12 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [145] = {.lex_state = 24, .external_lex_state = 2}, [146] = {.lex_state = 24, .external_lex_state = 2}, [147] = {.lex_state = 24, .external_lex_state = 2}, - [148] = {.lex_state = 24, .external_lex_state = 2}, + [148] = {.lex_state = 23, .external_lex_state = 2}, [149] = {.lex_state = 24, .external_lex_state = 2}, [150] = {.lex_state = 24, .external_lex_state = 2}, [151] = {.lex_state = 24, .external_lex_state = 2}, [152] = {.lex_state = 24, .external_lex_state = 2}, - [153] = {.lex_state = 19, .external_lex_state = 2}, + [153] = {.lex_state = 20, .external_lex_state = 2}, [154] = {.lex_state = 24, .external_lex_state = 2}, [155] = {.lex_state = 22, .external_lex_state = 2}, [156] = {.lex_state = 7, .external_lex_state = 3}, @@ -3150,7 +3121,7 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [296] = {.lex_state = 5, .external_lex_state = 3}, [297] = {.lex_state = 5, .external_lex_state = 3}, [298] = {.lex_state = 5, .external_lex_state = 3}, - [299] = {.lex_state = 19, .external_lex_state = 2}, + [299] = {.lex_state = 20, .external_lex_state = 2}, [300] = {.lex_state = 21, .external_lex_state = 2}, [301] = {.lex_state = 23, .external_lex_state = 2}, [302] = {.lex_state = 23, .external_lex_state = 2}, @@ -3163,43 +3134,43 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [309] = {.lex_state = 23, .external_lex_state = 2}, [310] = {.lex_state = 23, .external_lex_state = 2}, [311] = {.lex_state = 23, .external_lex_state = 2}, - [312] = {.lex_state = 20, .external_lex_state = 2}, + [312] = {.lex_state = 19, .external_lex_state = 2}, [313] = {.lex_state = 24, .external_lex_state = 2}, [314] = {.lex_state = 7, .external_lex_state = 3}, - [315] = {.lex_state = 20, .external_lex_state = 2}, - [316] = {.lex_state = 20, .external_lex_state = 2}, - [317] = {.lex_state = 20, .external_lex_state = 2}, - [318] = {.lex_state = 20, .external_lex_state = 2}, - [319] = {.lex_state = 20, .external_lex_state = 2}, - [320] = {.lex_state = 20, .external_lex_state = 2}, - [321] = {.lex_state = 20, .external_lex_state = 2}, + [315] = {.lex_state = 19, .external_lex_state = 2}, + [316] = {.lex_state = 19, .external_lex_state = 2}, + [317] = {.lex_state = 19, .external_lex_state = 2}, + [318] = {.lex_state = 19, .external_lex_state = 2}, + [319] = {.lex_state = 19, .external_lex_state = 2}, + [320] = {.lex_state = 19, .external_lex_state = 2}, + [321] = {.lex_state = 19, .external_lex_state = 2}, [322] = {.lex_state = 24, .external_lex_state = 2}, - [323] = {.lex_state = 20, .external_lex_state = 2}, - [324] = {.lex_state = 20, .external_lex_state = 2}, + [323] = {.lex_state = 19, .external_lex_state = 2}, + [324] = {.lex_state = 19, .external_lex_state = 2}, [325] = {.lex_state = 24, .external_lex_state = 2}, - [326] = {.lex_state = 20, .external_lex_state = 2}, - [327] = {.lex_state = 20, .external_lex_state = 2}, - [328] = {.lex_state = 20, .external_lex_state = 2}, - [329] = {.lex_state = 20, .external_lex_state = 2}, - [330] = {.lex_state = 20, .external_lex_state = 2}, - [331] = {.lex_state = 20, .external_lex_state = 2}, - [332] = {.lex_state = 20, .external_lex_state = 2}, + [326] = {.lex_state = 19, .external_lex_state = 2}, + [327] = {.lex_state = 19, .external_lex_state = 2}, + [328] = {.lex_state = 19, .external_lex_state = 2}, + [329] = {.lex_state = 19, .external_lex_state = 2}, + [330] = {.lex_state = 19, .external_lex_state = 2}, + [331] = {.lex_state = 19, .external_lex_state = 2}, + [332] = {.lex_state = 19, .external_lex_state = 2}, [333] = {.lex_state = 24, .external_lex_state = 2}, [334] = {.lex_state = 23, .external_lex_state = 2}, - [335] = {.lex_state = 20, .external_lex_state = 2}, - [336] = {.lex_state = 20, .external_lex_state = 2}, - [337] = {.lex_state = 20, .external_lex_state = 2}, - [338] = {.lex_state = 20, .external_lex_state = 2}, - [339] = {.lex_state = 20, .external_lex_state = 2}, - [340] = {.lex_state = 20, .external_lex_state = 2}, + [335] = {.lex_state = 19, .external_lex_state = 2}, + [336] = {.lex_state = 19, .external_lex_state = 2}, + [337] = {.lex_state = 19, .external_lex_state = 2}, + [338] = {.lex_state = 19, .external_lex_state = 2}, + [339] = {.lex_state = 19, .external_lex_state = 2}, + [340] = {.lex_state = 19, .external_lex_state = 2}, [341] = {.lex_state = 24, .external_lex_state = 2}, [342] = {.lex_state = 24, .external_lex_state = 2}, - [343] = {.lex_state = 20, .external_lex_state = 2}, - [344] = {.lex_state = 20, .external_lex_state = 2}, - [345] = {.lex_state = 20, .external_lex_state = 2}, - [346] = {.lex_state = 20, .external_lex_state = 2}, - [347] = {.lex_state = 20, .external_lex_state = 2}, - [348] = {.lex_state = 20, .external_lex_state = 2}, + [343] = {.lex_state = 19, .external_lex_state = 2}, + [344] = {.lex_state = 19, .external_lex_state = 2}, + [345] = {.lex_state = 19, .external_lex_state = 2}, + [346] = {.lex_state = 19, .external_lex_state = 2}, + [347] = {.lex_state = 19, .external_lex_state = 2}, + [348] = {.lex_state = 19, .external_lex_state = 2}, [349] = {.lex_state = 22, .external_lex_state = 2}, [350] = {.lex_state = 24, .external_lex_state = 2}, [351] = {.lex_state = 24, .external_lex_state = 2}, @@ -3272,41 +3243,41 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [418] = {.lex_state = 21, .external_lex_state = 2}, [419] = {.lex_state = 21, .external_lex_state = 2}, [420] = {.lex_state = 21, .external_lex_state = 2}, - [421] = {.lex_state = 19, .external_lex_state = 2}, + [421] = {.lex_state = 20, .external_lex_state = 2}, [422] = {.lex_state = 23, .external_lex_state = 2}, [423] = {.lex_state = 24, .external_lex_state = 2}, [424] = {.lex_state = 24, .external_lex_state = 2}, - [425] = {.lex_state = 19, .external_lex_state = 2}, - [426] = {.lex_state = 19, .external_lex_state = 2}, - [427] = {.lex_state = 19, .external_lex_state = 2}, - [428] = {.lex_state = 19, .external_lex_state = 2}, - [429] = {.lex_state = 19, .external_lex_state = 2}, - [430] = {.lex_state = 19, .external_lex_state = 2}, - [431] = {.lex_state = 19, .external_lex_state = 2}, - [432] = {.lex_state = 19, .external_lex_state = 2}, - [433] = {.lex_state = 19, .external_lex_state = 2}, + [425] = {.lex_state = 20, .external_lex_state = 2}, + [426] = {.lex_state = 20, .external_lex_state = 2}, + [427] = {.lex_state = 20, .external_lex_state = 2}, + [428] = {.lex_state = 20, .external_lex_state = 2}, + [429] = {.lex_state = 20, .external_lex_state = 2}, + [430] = {.lex_state = 20, .external_lex_state = 2}, + [431] = {.lex_state = 20, .external_lex_state = 2}, + [432] = {.lex_state = 20, .external_lex_state = 2}, + [433] = {.lex_state = 20, .external_lex_state = 2}, [434] = {.lex_state = 23, .external_lex_state = 2}, - [435] = {.lex_state = 19, .external_lex_state = 2}, - [436] = {.lex_state = 19, .external_lex_state = 2}, - [437] = {.lex_state = 19, .external_lex_state = 2}, - [438] = {.lex_state = 19, .external_lex_state = 2}, - [439] = {.lex_state = 19, .external_lex_state = 2}, - [440] = {.lex_state = 19, .external_lex_state = 2}, + [435] = {.lex_state = 20, .external_lex_state = 2}, + [436] = {.lex_state = 20, .external_lex_state = 2}, + [437] = {.lex_state = 20, .external_lex_state = 2}, + [438] = {.lex_state = 20, .external_lex_state = 2}, + [439] = {.lex_state = 20, .external_lex_state = 2}, + [440] = {.lex_state = 20, .external_lex_state = 2}, [441] = {.lex_state = 23, .external_lex_state = 2}, - [442] = {.lex_state = 19, .external_lex_state = 2}, - [443] = {.lex_state = 19, .external_lex_state = 2}, - [444] = {.lex_state = 19, .external_lex_state = 2}, - [445] = {.lex_state = 19, .external_lex_state = 2}, - [446] = {.lex_state = 19, .external_lex_state = 2}, - [447] = {.lex_state = 19, .external_lex_state = 2}, + [442] = {.lex_state = 20, .external_lex_state = 2}, + [443] = {.lex_state = 20, .external_lex_state = 2}, + [444] = {.lex_state = 20, .external_lex_state = 2}, + [445] = {.lex_state = 20, .external_lex_state = 2}, + [446] = {.lex_state = 20, .external_lex_state = 2}, + [447] = {.lex_state = 20, .external_lex_state = 2}, [448] = {.lex_state = 23, .external_lex_state = 2}, [449] = {.lex_state = 23, .external_lex_state = 2}, - [450] = {.lex_state = 19, .external_lex_state = 2}, - [451] = {.lex_state = 19, .external_lex_state = 2}, - [452] = {.lex_state = 19, .external_lex_state = 2}, - [453] = {.lex_state = 19, .external_lex_state = 2}, - [454] = {.lex_state = 19, .external_lex_state = 2}, - [455] = {.lex_state = 19, .external_lex_state = 2}, + [450] = {.lex_state = 20, .external_lex_state = 2}, + [451] = {.lex_state = 20, .external_lex_state = 2}, + [452] = {.lex_state = 20, .external_lex_state = 2}, + [453] = {.lex_state = 20, .external_lex_state = 2}, + [454] = {.lex_state = 20, .external_lex_state = 2}, + [455] = {.lex_state = 20, .external_lex_state = 2}, [456] = {.lex_state = 23, .external_lex_state = 2}, [457] = {.lex_state = 23, .external_lex_state = 2}, [458] = {.lex_state = 23, .external_lex_state = 2}, @@ -3494,36 +3465,36 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [640] = {.lex_state = 9}, [641] = {.lex_state = 23}, [642] = {.lex_state = 56}, - [643] = {.lex_state = 20}, + [643] = {.lex_state = 19}, [644] = {.lex_state = 22}, [645] = {.lex_state = 21}, - [646] = {.lex_state = 19}, + [646] = {.lex_state = 20}, [647] = {.lex_state = 56}, [648] = {.lex_state = 56}, [649] = {.lex_state = 23}, - [650] = {.lex_state = 20}, + [650] = {.lex_state = 19}, [651] = {.lex_state = 23}, - [652] = {.lex_state = 20}, + [652] = {.lex_state = 19}, [653] = {.lex_state = 22}, [654] = {.lex_state = 23}, - [655] = {.lex_state = 20}, + [655] = {.lex_state = 19}, [656] = {.lex_state = 22}, [657] = {.lex_state = 21}, - [658] = {.lex_state = 19}, + [658] = {.lex_state = 20}, [659] = {.lex_state = 22}, [660] = {.lex_state = 21}, [661] = {.lex_state = 21}, - [662] = {.lex_state = 19}, - [663] = {.lex_state = 19}, + [662] = {.lex_state = 20}, + [663] = {.lex_state = 20}, [664] = {.lex_state = 56}, [665] = {.lex_state = 56}, [666] = {.lex_state = 56}, [667] = {.lex_state = 23}, - [668] = {.lex_state = 20}, + [668] = {.lex_state = 19}, [669] = {.lex_state = 56}, [670] = {.lex_state = 22}, [671] = {.lex_state = 21}, - [672] = {.lex_state = 19}, + [672] = {.lex_state = 20}, [673] = {.lex_state = 56}, [674] = {.lex_state = 56}, [675] = {.lex_state = 56}, @@ -3531,16 +3502,16 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [677] = {.lex_state = 56}, [678] = {.lex_state = 56}, [679] = {.lex_state = 22}, - [680] = {.lex_state = 19}, + [680] = {.lex_state = 20}, [681] = {.lex_state = 21}, [682] = {.lex_state = 56}, [683] = {.lex_state = 23}, - [684] = {.lex_state = 20}, + [684] = {.lex_state = 19}, [685] = {.lex_state = 22}, [686] = {.lex_state = 21}, - [687] = {.lex_state = 19}, + [687] = {.lex_state = 20}, [688] = {.lex_state = 23}, - [689] = {.lex_state = 20}, + [689] = {.lex_state = 19}, [690] = {.lex_state = 0}, [691] = {.lex_state = 0}, [692] = {.lex_state = 0}, @@ -3721,33 +3692,6 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [867] = {.lex_state = 24}, }; -enum { - ts_external_token_bracket_argument = 0, - ts_external_token_bracket_comment = 1, - ts_external_token_line_comment = 2, -}; - -static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = { - [ts_external_token_bracket_argument] = sym_bracket_argument, - [ts_external_token_bracket_comment] = sym_bracket_comment, - [ts_external_token_line_comment] = sym_line_comment, -}; - -static const bool ts_external_scanner_states[4][EXTERNAL_TOKEN_COUNT] = { - [1] = { - [ts_external_token_bracket_argument] = true, - [ts_external_token_bracket_comment] = true, - [ts_external_token_line_comment] = true, - }, - [2] = { - [ts_external_token_bracket_comment] = true, - [ts_external_token_line_comment] = true, - }, - [3] = { - [ts_external_token_bracket_argument] = true, - }, -}; - static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [0] = { [ts_builtin_sym_end] = ACTIONS(1), @@ -3778,21 +3722,21 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [1] = { [sym_source_file] = STATE(855), [sym_if_command] = STATE(10), - [sym_if_condition] = STATE(151), - [sym_foreach_command] = STATE(148), - [sym_foreach_loop] = STATE(151), - [sym_while_command] = STATE(145), - [sym_while_loop] = STATE(151), - [sym_function_command] = STATE(147), - [sym_function_def] = STATE(151), - [sym_macro_command] = STATE(154), - [sym_macro_def] = STATE(151), - [sym_block_command] = STATE(152), - [sym_block_def] = STATE(151), - [sym_normal_command] = STATE(151), - [sym__command_invocation] = STATE(151), - [sym__untrimmed_command_invocation] = STATE(151), - [aux_sym_source_file_repeat1] = STATE(151), + [sym_if_condition] = STATE(150), + [sym_foreach_command] = STATE(149), + [sym_foreach_loop] = STATE(150), + [sym_while_command] = STATE(119), + [sym_while_loop] = STATE(150), + [sym_function_command] = STATE(154), + [sym_function_def] = STATE(150), + [sym_macro_command] = STATE(152), + [sym_macro_def] = STATE(150), + [sym_block_command] = STATE(151), + [sym_block_def] = STATE(150), + [sym_normal_command] = STATE(150), + [sym__command_invocation] = STATE(150), + [sym__untrimmed_command_invocation] = STATE(150), + [aux_sym_source_file_repeat1] = STATE(150), [ts_builtin_sym_end] = ACTIONS(3), [aux_sym__untrimmed_argument_token1] = ACTIONS(5), [sym_if] = ACTIONS(7), @@ -3832,15 +3776,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(334), 1, sym_endif_command, ACTIONS(21), 3, @@ -3887,15 +3831,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(385), 1, sym_endif_command, ACTIONS(21), 3, @@ -3942,15 +3886,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(389), 1, sym_endif_command, ACTIONS(21), 3, @@ -3997,15 +3941,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(353), 1, sym_endif_command, ACTIONS(21), 3, @@ -4052,15 +3996,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(421), 1, sym_endif_command, ACTIONS(21), 3, @@ -4107,15 +4051,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(426), 1, sym_endif_command, ACTIONS(21), 3, @@ -4162,15 +4106,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(349), 1, sym_endif_command, ACTIONS(21), 3, @@ -4217,15 +4161,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(316), 1, sym_endif_command, ACTIONS(21), 3, @@ -4272,15 +4216,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(361), 1, sym_endif_command, ACTIONS(21), 3, @@ -4327,15 +4271,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(312), 1, sym_endif_command, ACTIONS(21), 3, @@ -4382,15 +4326,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(276), 1, sym_endif_command, ACTIONS(21), 3, @@ -4437,15 +4381,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(267), 1, sym_endif_command, ACTIONS(21), 3, @@ -4492,15 +4436,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(459), 1, sym_endif_command, ACTIONS(21), 3, @@ -4547,15 +4491,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, STATE(341), 1, sym_endif_command, ACTIONS(21), 3, @@ -4607,7 +4551,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4639,7 +4583,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(59), 1, anon_sym_RPAREN, - STATE(739), 1, + STATE(821), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -4655,7 +4599,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4703,7 +4647,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4751,7 +4695,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4799,7 +4743,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4847,7 +4791,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4895,7 +4839,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4943,7 +4887,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -4991,7 +4935,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5039,7 +4983,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5087,7 +5031,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5135,7 +5079,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5183,7 +5127,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5231,7 +5175,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5279,7 +5223,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5327,7 +5271,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5375,7 +5319,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5423,7 +5367,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5471,7 +5415,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5519,7 +5463,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5567,7 +5511,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5615,7 +5559,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5663,7 +5607,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5711,7 +5655,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5759,7 +5703,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5807,7 +5751,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5855,7 +5799,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5903,7 +5847,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5951,7 +5895,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -5999,7 +5943,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6047,7 +5991,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6095,7 +6039,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6143,7 +6087,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6191,7 +6135,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6239,7 +6183,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6287,7 +6231,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6335,7 +6279,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6367,7 +6311,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(131), 1, anon_sym_RPAREN, - STATE(776), 1, + STATE(738), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6383,7 +6327,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6415,7 +6359,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(133), 1, anon_sym_RPAREN, - STATE(738), 1, + STATE(700), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6431,7 +6375,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6463,7 +6407,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(135), 1, anon_sym_RPAREN, - STATE(700), 1, + STATE(726), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6479,7 +6423,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6511,7 +6455,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(137), 1, anon_sym_RPAREN, - STATE(726), 1, + STATE(701), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6527,7 +6471,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6559,7 +6503,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(139), 1, anon_sym_RPAREN, - STATE(701), 1, + STATE(704), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6575,7 +6519,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6607,7 +6551,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(141), 1, anon_sym_RPAREN, - STATE(704), 1, + STATE(752), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6623,7 +6567,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6655,7 +6599,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(143), 1, anon_sym_RPAREN, - STATE(752), 1, + STATE(707), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6671,7 +6615,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6719,7 +6663,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6751,7 +6695,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(147), 1, anon_sym_RPAREN, - STATE(821), 1, + STATE(837), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6767,7 +6711,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6815,7 +6759,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6847,7 +6791,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(151), 1, anon_sym_RPAREN, - STATE(707), 1, + STATE(817), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6863,7 +6807,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6895,7 +6839,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(153), 1, anon_sym_RPAREN, - STATE(837), 1, + STATE(711), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6911,7 +6855,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -6943,7 +6887,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(155), 1, anon_sym_RPAREN, - STATE(817), 1, + STATE(753), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -6959,7 +6903,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7007,7 +6951,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7039,7 +6983,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(159), 1, anon_sym_RPAREN, - STATE(711), 1, + STATE(754), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7055,7 +6999,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7087,7 +7031,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(161), 1, anon_sym_RPAREN, - STATE(753), 1, + STATE(715), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7103,7 +7047,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7151,7 +7095,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7183,7 +7127,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(165), 1, anon_sym_RPAREN, - STATE(754), 1, + STATE(716), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7199,7 +7143,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7247,7 +7191,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7279,7 +7223,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(169), 1, anon_sym_RPAREN, - STATE(716), 1, + STATE(717), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7295,7 +7239,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7343,7 +7287,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7386,15 +7330,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, ACTIONS(173), 3, sym_bracket_comment, sym_line_comment, @@ -7444,7 +7388,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7492,7 +7436,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7524,7 +7468,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(209), 1, anon_sym_RPAREN, - STATE(717), 1, + STATE(757), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7540,7 +7484,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7572,7 +7516,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(211), 1, anon_sym_RPAREN, - STATE(757), 1, + STATE(758), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7588,7 +7532,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7620,7 +7564,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(213), 1, anon_sym_RPAREN, - STATE(758), 1, + STATE(760), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7636,7 +7580,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7668,7 +7612,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(215), 1, anon_sym_RPAREN, - STATE(760), 1, + STATE(763), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7684,7 +7628,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7716,7 +7660,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(217), 1, anon_sym_RPAREN, - STATE(763), 1, + STATE(772), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7732,7 +7676,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7780,7 +7724,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7828,7 +7772,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7860,7 +7804,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(223), 1, anon_sym_RPAREN, - STATE(772), 1, + STATE(776), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7876,7 +7820,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7924,7 +7868,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -7956,7 +7900,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(227), 1, anon_sym_RPAREN, - STATE(715), 1, + STATE(739), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -7972,7 +7916,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8004,7 +7948,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(229), 1, anon_sym_RPAREN, - STATE(787), 1, + STATE(786), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8020,7 +7964,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8052,7 +7996,7 @@ static const uint16_t ts_small_parse_table[] = { sym_bracket_argument, ACTIONS(231), 1, anon_sym_RPAREN, - STATE(786), 1, + STATE(787), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8068,7 +8012,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8098,7 +8042,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(798), 1, + STATE(721), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8114,7 +8058,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8144,15 +8088,15 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(816), 1, - sym_argument_list, + ACTIONS(235), 1, + anon_sym_RPAREN, STATE(240), 2, sym_quoted_argument, sym_unquoted_argument, STATE(241), 2, sym__escape_encoded, sym__escape_semicolon, - ACTIONS(47), 3, + ACTIONS(233), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -8160,7 +8104,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(95), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8190,7 +8134,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(801), 1, + STATE(727), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8206,7 +8150,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8236,7 +8180,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(799), 1, + STATE(801), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8252,7 +8196,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8282,7 +8226,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(797), 1, + STATE(799), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8298,7 +8242,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8328,7 +8272,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(793), 1, + STATE(798), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8344,7 +8288,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8364,17 +8308,17 @@ static const uint16_t ts_small_parse_table[] = { aux_sym_unquoted_argument_repeat1, aux_sym__unquoted_text_repeat1, [5940] = 13, - ACTIONS(236), 1, + ACTIONS(240), 1, anon_sym_DOLLAR, - ACTIONS(242), 1, + ACTIONS(246), 1, anon_sym_LPAREN, - ACTIONS(245), 1, + ACTIONS(249), 1, anon_sym_RPAREN, - ACTIONS(247), 1, + ACTIONS(251), 1, anon_sym_DQUOTE, - ACTIONS(250), 1, + ACTIONS(254), 1, aux_sym__unquoted_text_token1, - ACTIONS(253), 1, + ACTIONS(257), 1, sym_bracket_argument, STATE(240), 2, sym_quoted_argument, @@ -8382,7 +8326,7 @@ static const uint16_t ts_small_parse_table[] = { STATE(241), 2, sym__escape_encoded, sym__escape_semicolon, - ACTIONS(239), 3, + ACTIONS(243), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -8395,7 +8339,7 @@ static const uint16_t ts_small_parse_table[] = { sym__untrimmed_argument, sym__paren_argument, aux_sym__paren_argument_repeat1, - ACTIONS(233), 6, + ACTIONS(237), 6, sym__escape_identity, anon_sym_BSLASHt, anon_sym_BSLASHr, @@ -8420,7 +8364,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(792), 1, + STATE(797), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8436,7 +8380,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8466,15 +8410,15 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - ACTIONS(258), 1, - anon_sym_RPAREN, + STATE(792), 1, + sym_argument_list, STATE(240), 2, sym_quoted_argument, sym_unquoted_argument, STATE(241), 2, sym__escape_encoded, sym__escape_semicolon, - ACTIONS(256), 3, + ACTIONS(47), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -8482,7 +8426,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(104), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8528,7 +8472,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(95), 4, + STATE(90), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8558,15 +8502,15 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(734), 1, - sym_argument_list, + ACTIONS(264), 1, + anon_sym_RPAREN, STATE(240), 2, sym_quoted_argument, sym_unquoted_argument, STATE(241), 2, sym__escape_encoded, sym__escape_semicolon, - ACTIONS(47), 3, + ACTIONS(233), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -8574,7 +8518,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(95), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8604,7 +8548,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(732), 1, + STATE(734), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8620,7 +8564,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8650,7 +8594,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(727), 1, + STATE(793), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8666,7 +8610,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8696,7 +8640,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(722), 1, + STATE(732), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8712,7 +8656,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8742,7 +8686,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(720), 1, + STATE(722), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8758,7 +8702,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8788,15 +8732,15 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - ACTIONS(264), 1, - anon_sym_RPAREN, + STATE(720), 1, + sym_argument_list, STATE(240), 2, sym_quoted_argument, sym_unquoted_argument, STATE(241), 2, sym__escape_encoded, sym__escape_semicolon, - ACTIONS(260), 3, + ACTIONS(47), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -8804,7 +8748,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(95), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8834,7 +8778,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(721), 1, + STATE(708), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8850,7 +8794,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8880,7 +8824,7 @@ static const uint16_t ts_small_parse_table[] = { aux_sym__unquoted_text_token1, ACTIONS(57), 1, sym_bracket_argument, - STATE(708), 1, + STATE(816), 1, sym_argument_list, STATE(240), 2, sym_quoted_argument, @@ -8896,7 +8840,7 @@ static const uint16_t ts_small_parse_table[] = { sym_normal_var, sym_env_var, sym_cache_var, - STATE(98), 4, + STATE(99), 4, sym_argument, sym__untrimmed_argument, sym__paren_argument, @@ -8933,15 +8877,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, ACTIONS(266), 3, sym_bracket_comment, sym_line_comment, @@ -8979,15 +8923,15 @@ static const uint16_t ts_small_parse_table[] = { STATE(13), 1, sym_if_command, STATE(109), 1, - sym_function_command, - STATE(111), 1, - sym_while_command, - STATE(112), 1, - sym_foreach_command, - STATE(123), 1, - sym_block_command, - STATE(132), 1, sym_macro_command, + STATE(111), 1, + sym_function_command, + STATE(112), 1, + sym_while_command, + STATE(113), 1, + sym_foreach_command, + STATE(122), 1, + sym_block_command, ACTIONS(292), 3, sym_bracket_comment, sym_line_comment, @@ -9022,25 +8966,25 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(298), 1, sym_identifier, - STATE(8), 1, + STATE(3), 1, sym_if_command, - STATE(116), 1, - sym_foreach_command, - STATE(117), 1, - sym_while_command, - STATE(118), 1, - sym_function_command, - STATE(119), 1, + STATE(110), 1, sym_macro_command, - STATE(120), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, - STATE(644), 1, + STATE(145), 1, + sym_foreach_command, + STATE(645), 1, sym_body, ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9064,27 +9008,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(302), 1, + ACTIONS(298), 1, sym_identifier, - STATE(2), 1, + STATE(3), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, - sym_function_command, - STATE(150), 1, + STATE(110), 1, sym_macro_command, - STATE(667), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, + sym_block_command, + STATE(145), 1, + sym_foreach_command, + STATE(657), 1, sym_body, - ACTIONS(300), 3, + ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9108,27 +9052,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(306), 1, + ACTIONS(302), 1, sym_identifier, - STATE(11), 1, + STATE(8), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, STATE(114), 1, - sym_block_command, - STATE(125), 1, - sym_function_command, - STATE(129), 1, + sym_foreach_command, + STATE(115), 1, sym_while_command, - STATE(643), 1, + STATE(116), 1, + sym_function_command, + STATE(117), 1, + sym_macro_command, + STATE(118), 1, + sym_block_command, + STATE(644), 1, sym_body, - ACTIONS(304), 3, + ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(155), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9152,27 +9096,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(302), 1, + ACTIONS(306), 1, sym_identifier, - STATE(2), 1, + STATE(11), 1, sym_if_command, - STATE(115), 1, + STATE(126), 1, sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, - sym_function_command, - STATE(150), 1, + STATE(131), 1, sym_macro_command, - STATE(688), 1, + STATE(135), 1, + sym_function_command, + STATE(146), 1, + sym_while_command, + STATE(147), 1, + sym_foreach_command, + STATE(643), 1, sym_body, - ACTIONS(300), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9198,25 +9142,25 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(310), 1, sym_identifier, - STATE(3), 1, + STATE(2), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, + STATE(121), 1, sym_function_command, - STATE(134), 1, - sym_macro_command, - STATE(138), 1, + STATE(128), 1, sym_block_command, - STATE(671), 1, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, + STATE(688), 1, sym_body, ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(130), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9240,27 +9184,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(314), 1, + ACTIONS(310), 1, sym_identifier, - STATE(6), 1, + STATE(2), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, + STATE(121), 1, sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, + STATE(128), 1, sym_block_command, - STATE(146), 1, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, sym_foreach_command, - STATE(672), 1, + STATE(144), 1, + sym_while_command, + STATE(641), 1, sym_body, - ACTIONS(312), 3, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(153), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9284,27 +9228,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(314), 1, + ACTIONS(306), 1, sym_identifier, - STATE(6), 1, + STATE(11), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, + STATE(126), 1, sym_block_command, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, + sym_function_command, STATE(146), 1, + sym_while_command, + STATE(147), 1, sym_foreach_command, - STATE(662), 1, + STATE(689), 1, sym_body, - ACTIONS(312), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(153), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9330,25 +9274,25 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(302), 1, sym_identifier, - STATE(2), 1, + STATE(8), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, + STATE(114), 1, sym_foreach_command, - STATE(140), 1, + STATE(115), 1, sym_while_command, - STATE(149), 1, + STATE(116), 1, sym_function_command, - STATE(150), 1, + STATE(117), 1, sym_macro_command, - STATE(641), 1, + STATE(118), 1, + sym_block_command, + STATE(679), 1, sym_body, ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(155), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9372,27 +9316,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(306), 1, + ACTIONS(298), 1, sym_identifier, - STATE(11), 1, + STATE(3), 1, sym_if_command, STATE(110), 1, - sym_foreach_command, - STATE(113), 1, sym_macro_command, - STATE(114), 1, - sym_block_command, + STATE(124), 1, + sym_while_command, STATE(125), 1, sym_function_command, - STATE(129), 1, - sym_while_command, - STATE(689), 1, + STATE(137), 1, + sym_block_command, + STATE(145), 1, + sym_foreach_command, + STATE(681), 1, sym_body, - ACTIONS(304), 3, + ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9416,27 +9360,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(298), 1, + ACTIONS(314), 1, sym_identifier, - STATE(8), 1, + STATE(6), 1, sym_if_command, - STATE(116), 1, + STATE(138), 1, sym_foreach_command, - STATE(117), 1, + STATE(140), 1, sym_while_command, - STATE(118), 1, + STATE(141), 1, sym_function_command, - STATE(119), 1, + STATE(142), 1, sym_macro_command, - STATE(120), 1, + STATE(143), 1, sym_block_command, - STATE(679), 1, + STATE(680), 1, sym_body, - ACTIONS(296), 3, + ACTIONS(312), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9460,27 +9404,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(310), 1, + ACTIONS(306), 1, sym_identifier, - STATE(3), 1, + STATE(11), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, - sym_macro_command, - STATE(138), 1, sym_block_command, - STATE(681), 1, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, + sym_function_command, + STATE(146), 1, + sym_while_command, + STATE(147), 1, + sym_foreach_command, + STATE(652), 1, sym_body, - ACTIONS(308), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(130), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9492,94 +9436,6 @@ static const uint16_t ts_small_parse_table[] = { sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, [7432] = 16, - ACTIONS(7), 1, - sym_if, - ACTIONS(9), 1, - sym_foreach, - ACTIONS(11), 1, - sym_while, - ACTIONS(13), 1, - sym_function, - ACTIONS(15), 1, - sym_macro, - ACTIONS(17), 1, - sym_block, - ACTIONS(314), 1, - sym_identifier, - STATE(6), 1, - sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, - sym_block_command, - STATE(146), 1, - sym_foreach_command, - STATE(680), 1, - sym_body, - ACTIONS(312), 3, - sym_bracket_comment, - sym_line_comment, - aux_sym__untrimmed_argument_token1, - STATE(153), 10, - sym_if_condition, - sym_foreach_loop, - sym_while_loop, - sym_function_def, - sym_macro_def, - sym_block_def, - sym_normal_command, - sym__command_invocation, - sym__untrimmed_command_invocation, - aux_sym_source_file_repeat1, - [7492] = 16, - ACTIONS(269), 1, - sym_if, - ACTIONS(272), 1, - sym_endblock, - ACTIONS(274), 1, - sym_foreach, - ACTIONS(277), 1, - sym_while, - ACTIONS(280), 1, - sym_function, - ACTIONS(283), 1, - sym_macro, - ACTIONS(286), 1, - sym_block, - ACTIONS(319), 1, - sym_identifier, - STATE(6), 1, - sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, - sym_block_command, - STATE(146), 1, - sym_foreach_command, - ACTIONS(316), 3, - sym_bracket_comment, - sym_line_comment, - aux_sym__untrimmed_argument_token1, - STATE(121), 10, - sym_if_condition, - sym_foreach_loop, - sym_while_loop, - sym_function_def, - sym_macro_def, - sym_block_def, - sym_normal_command, - sym__command_invocation, - sym__untrimmed_command_invocation, - aux_sym_source_file_repeat1, - [7552] = 16, ACTIONS(269), 1, sym_if, ACTIONS(272), 1, @@ -9594,25 +9450,25 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(286), 1, sym_block, - ACTIONS(325), 1, + ACTIONS(319), 1, sym_identifier, STATE(11), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, - STATE(114), 1, + STATE(126), 1, sym_block_command, - STATE(125), 1, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, sym_function_command, - STATE(129), 1, + STATE(146), 1, sym_while_command, - ACTIONS(322), 3, + STATE(147), 1, + sym_foreach_command, + ACTIONS(316), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(122), 10, + STATE(120), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9623,7 +9479,51 @@ static const uint16_t ts_small_parse_table[] = { sym__command_invocation, sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, - [7612] = 16, + [7492] = 16, + ACTIONS(7), 1, + sym_if, + ACTIONS(9), 1, + sym_foreach, + ACTIONS(11), 1, + sym_while, + ACTIONS(13), 1, + sym_function, + ACTIONS(15), 1, + sym_macro, + ACTIONS(17), 1, + sym_block, + ACTIONS(302), 1, + sym_identifier, + STATE(8), 1, + sym_if_command, + STATE(114), 1, + sym_foreach_command, + STATE(115), 1, + sym_while_command, + STATE(116), 1, + sym_function_command, + STATE(117), 1, + sym_macro_command, + STATE(118), 1, + sym_block_command, + STATE(653), 1, + sym_body, + ACTIONS(300), 3, + sym_bracket_comment, + sym_line_comment, + aux_sym__untrimmed_argument_token1, + STATE(155), 10, + sym_if_condition, + sym_foreach_loop, + sym_while_loop, + sym_function_def, + sym_macro_def, + sym_block_def, + sym_normal_command, + sym__command_invocation, + sym__untrimmed_command_invocation, + aux_sym_source_file_repeat1, + [7552] = 16, ACTIONS(7), 1, sym_if, ACTIONS(9), 1, @@ -9640,16 +9540,16 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(6), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, - sym_block_command, - STATE(146), 1, + STATE(138), 1, sym_foreach_command, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, + sym_block_command, STATE(646), 1, sym_body, ACTIONS(312), 3, @@ -9667,6 +9567,50 @@ static const uint16_t ts_small_parse_table[] = { sym__command_invocation, sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, + [7612] = 16, + ACTIONS(269), 1, + sym_if, + ACTIONS(272), 1, + sym_endblock, + ACTIONS(274), 1, + sym_foreach, + ACTIONS(277), 1, + sym_while, + ACTIONS(280), 1, + sym_function, + ACTIONS(283), 1, + sym_macro, + ACTIONS(286), 1, + sym_block, + ACTIONS(325), 1, + sym_identifier, + STATE(6), 1, + sym_if_command, + STATE(138), 1, + sym_foreach_command, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, + sym_block_command, + ACTIONS(322), 3, + sym_bracket_comment, + sym_line_comment, + aux_sym__untrimmed_argument_token1, + STATE(123), 10, + sym_if_condition, + sym_foreach_loop, + sym_while_loop, + sym_function_def, + sym_macro_def, + sym_block_def, + sym_normal_command, + sym__command_invocation, + sym__untrimmed_command_invocation, + aux_sym_source_file_repeat1, [7672] = 16, ACTIONS(7), 1, sym_if, @@ -9680,27 +9624,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(302), 1, + ACTIONS(306), 1, sym_identifier, - STATE(2), 1, + STATE(11), 1, sym_if_command, - STATE(115), 1, + STATE(126), 1, sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, - sym_function_command, - STATE(150), 1, + STATE(131), 1, sym_macro_command, - STATE(654), 1, + STATE(135), 1, + sym_function_command, + STATE(146), 1, + sym_while_command, + STATE(147), 1, + sym_foreach_command, + STATE(655), 1, sym_body, - ACTIONS(300), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9724,23 +9668,23 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(298), 1, + ACTIONS(302), 1, sym_identifier, STATE(8), 1, sym_if_command, - STATE(116), 1, + STATE(114), 1, sym_foreach_command, - STATE(117), 1, + STATE(115), 1, sym_while_command, - STATE(118), 1, + STATE(116), 1, sym_function_command, - STATE(119), 1, + STATE(117), 1, sym_macro_command, - STATE(120), 1, + STATE(118), 1, sym_block_command, - STATE(670), 1, + STATE(656), 1, sym_body, - ACTIONS(296), 3, + ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -9768,27 +9712,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(306), 1, + ACTIONS(314), 1, sym_identifier, - STATE(11), 1, + STATE(6), 1, sym_if_command, - STATE(110), 1, + STATE(138), 1, sym_foreach_command, - STATE(113), 1, - sym_macro_command, - STATE(114), 1, - sym_block_command, - STATE(125), 1, - sym_function_command, - STATE(129), 1, + STATE(140), 1, sym_while_command, - STATE(655), 1, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, + sym_block_command, + STATE(672), 1, sym_body, - ACTIONS(304), 3, + ACTIONS(312), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9818,16 +9762,16 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(3), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, + STATE(110), 1, sym_macro_command, - STATE(138), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, + STATE(145), 1, + sym_foreach_command, ACTIONS(328), 3, sym_bracket_comment, sym_line_comment, @@ -9856,27 +9800,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(298), 1, + ACTIONS(314), 1, sym_identifier, - STATE(8), 1, + STATE(6), 1, sym_if_command, - STATE(116), 1, + STATE(138), 1, sym_foreach_command, - STATE(117), 1, + STATE(140), 1, sym_while_command, - STATE(118), 1, + STATE(141), 1, sym_function_command, - STATE(119), 1, + STATE(142), 1, sym_macro_command, - STATE(120), 1, + STATE(143), 1, sym_block_command, - STATE(656), 1, + STATE(662), 1, sym_body, - ACTIONS(296), 3, + ACTIONS(312), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9900,27 +9844,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, + ACTIONS(294), 1, + sym_endwhile, ACTIONS(306), 1, sym_identifier, STATE(11), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, - STATE(114), 1, + STATE(126), 1, sym_block_command, - STATE(125), 1, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, sym_function_command, - STATE(129), 1, + STATE(146), 1, sym_while_command, - STATE(668), 1, - sym_body, - ACTIONS(304), 3, + STATE(147), 1, + sym_foreach_command, + ACTIONS(334), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(120), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -9946,21 +9890,21 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(294), 1, sym_endmacro, - ACTIONS(310), 1, + ACTIONS(298), 1, sym_identifier, STATE(3), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, + STATE(110), 1, sym_macro_command, - STATE(138), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, - ACTIONS(334), 3, + STATE(145), 1, + sym_foreach_command, + ACTIONS(336), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -9988,27 +9932,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(294), 1, - sym_endwhile, - ACTIONS(306), 1, + ACTIONS(298), 1, sym_identifier, - STATE(11), 1, + STATE(3), 1, sym_if_command, STATE(110), 1, - sym_foreach_command, - STATE(113), 1, sym_macro_command, - STATE(114), 1, - sym_block_command, + STATE(124), 1, + sym_while_command, STATE(125), 1, sym_function_command, - STATE(129), 1, - sym_while_command, - ACTIONS(336), 3, + STATE(137), 1, + sym_block_command, + STATE(145), 1, + sym_foreach_command, + STATE(671), 1, + sym_body, + ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(122), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10032,23 +9976,23 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(310), 1, + ACTIONS(298), 1, sym_identifier, STATE(3), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, + STATE(110), 1, sym_macro_command, - STATE(138), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, - STATE(645), 1, + STATE(145), 1, + sym_foreach_command, + STATE(661), 1, sym_body, - ACTIONS(308), 3, + ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, @@ -10082,15 +10026,15 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(8), 1, sym_if_command, - STATE(116), 1, + STATE(114), 1, sym_foreach_command, - STATE(117), 1, + STATE(115), 1, sym_while_command, - STATE(118), 1, + STATE(116), 1, sym_function_command, - STATE(119), 1, + STATE(117), 1, sym_macro_command, - STATE(120), 1, + STATE(118), 1, sym_block_command, ACTIONS(338), 3, sym_bracket_comment, @@ -10108,50 +10052,6 @@ static const uint16_t ts_small_parse_table[] = { sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, [8272] = 16, - ACTIONS(7), 1, - sym_if, - ACTIONS(9), 1, - sym_foreach, - ACTIONS(11), 1, - sym_while, - ACTIONS(13), 1, - sym_function, - ACTIONS(15), 1, - sym_macro, - ACTIONS(17), 1, - sym_block, - ACTIONS(310), 1, - sym_identifier, - STATE(3), 1, - sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, - sym_macro_command, - STATE(138), 1, - sym_block_command, - STATE(657), 1, - sym_body, - ACTIONS(308), 3, - sym_bracket_comment, - sym_line_comment, - aux_sym__untrimmed_argument_token1, - STATE(130), 10, - sym_if_condition, - sym_foreach_loop, - sym_while_loop, - sym_function_def, - sym_macro_def, - sym_block_def, - sym_normal_command, - sym__command_invocation, - sym__untrimmed_command_invocation, - aux_sym_source_file_repeat1, - [8332] = 16, ACTIONS(269), 1, sym_if, ACTIONS(272), 1, @@ -10170,21 +10070,21 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(2), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, + STATE(121), 1, sym_function_command, - STATE(150), 1, + STATE(128), 1, + sym_block_command, + STATE(132), 1, sym_macro_command, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, ACTIONS(344), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(135), 10, + STATE(134), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10195,7 +10095,7 @@ static const uint16_t ts_small_parse_table[] = { sym__command_invocation, sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, - [8392] = 16, + [8332] = 16, ACTIONS(7), 1, sym_if, ACTIONS(9), 1, @@ -10210,25 +10110,25 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(302), 1, sym_identifier, - STATE(2), 1, + STATE(8), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, + STATE(114), 1, sym_foreach_command, - STATE(140), 1, + STATE(115), 1, sym_while_command, - STATE(149), 1, + STATE(116), 1, sym_function_command, - STATE(150), 1, + STATE(117), 1, sym_macro_command, - STATE(649), 1, + STATE(118), 1, + sym_block_command, + STATE(670), 1, sym_body, ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(155), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10239,7 +10139,7 @@ static const uint16_t ts_small_parse_table[] = { sym__command_invocation, sym__untrimmed_command_invocation, aux_sym_source_file_repeat1, - [8452] = 16, + [8392] = 16, ACTIONS(269), 1, sym_if, ACTIONS(274), 1, @@ -10258,21 +10158,65 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(10), 1, sym_if_command, - STATE(145), 1, + STATE(119), 1, sym_while_command, - STATE(147), 1, - sym_function_command, - STATE(148), 1, + STATE(149), 1, sym_foreach_command, - STATE(152), 1, + STATE(151), 1, sym_block_command, - STATE(154), 1, + STATE(152), 1, sym_macro_command, + STATE(154), 1, + sym_function_command, ACTIONS(352), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(137), 10, + STATE(136), 10, + sym_if_condition, + sym_foreach_loop, + sym_while_loop, + sym_function_def, + sym_macro_def, + sym_block_def, + sym_normal_command, + sym__command_invocation, + sym__untrimmed_command_invocation, + aux_sym_source_file_repeat1, + [8452] = 16, + ACTIONS(7), 1, + sym_if, + ACTIONS(9), 1, + sym_foreach, + ACTIONS(11), 1, + sym_while, + ACTIONS(13), 1, + sym_function, + ACTIONS(15), 1, + sym_macro, + ACTIONS(17), 1, + sym_block, + ACTIONS(314), 1, + sym_identifier, + STATE(6), 1, + sym_if_command, + STATE(138), 1, + sym_foreach_command, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, + sym_block_command, + STATE(658), 1, + sym_body, + ACTIONS(312), 3, + sym_bracket_comment, + sym_line_comment, + aux_sym__untrimmed_argument_token1, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10296,27 +10240,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(314), 1, + ACTIONS(310), 1, sym_identifier, - STATE(6), 1, + STATE(2), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, + STATE(121), 1, sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, + STATE(128), 1, sym_block_command, - STATE(146), 1, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, sym_foreach_command, - STATE(658), 1, + STATE(144), 1, + sym_while_command, + STATE(683), 1, sym_body, - ACTIONS(312), 3, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(153), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10340,27 +10284,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(294), 1, - sym_endforeach, - ACTIONS(302), 1, + ACTIONS(310), 1, sym_identifier, STATE(2), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, + STATE(121), 1, sym_function_command, - STATE(150), 1, + STATE(128), 1, + sym_block_command, + STATE(132), 1, sym_macro_command, - ACTIONS(358), 3, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, + STATE(649), 1, + sym_body, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(135), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10388,23 +10332,23 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(11), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, - STATE(114), 1, + STATE(126), 1, sym_block_command, - STATE(125), 1, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, sym_function_command, - STATE(129), 1, + STATE(146), 1, sym_while_command, - STATE(650), 1, + STATE(147), 1, + sym_foreach_command, + STATE(684), 1, sym_body, ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10428,27 +10372,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(306), 1, + ACTIONS(302), 1, sym_identifier, - STATE(11), 1, + STATE(8), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, STATE(114), 1, - sym_block_command, - STATE(125), 1, - sym_function_command, - STATE(129), 1, + sym_foreach_command, + STATE(115), 1, sym_while_command, - STATE(684), 1, + STATE(116), 1, + sym_function_command, + STATE(117), 1, + sym_macro_command, + STATE(118), 1, + sym_block_command, + STATE(685), 1, sym_body, - ACTIONS(304), 3, + ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(155), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10474,25 +10418,25 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(298), 1, sym_identifier, - STATE(8), 1, + STATE(3), 1, sym_if_command, - STATE(116), 1, - sym_foreach_command, - STATE(117), 1, - sym_while_command, - STATE(118), 1, - sym_function_command, - STATE(119), 1, + STATE(110), 1, sym_macro_command, - STATE(120), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, - STATE(685), 1, + STATE(145), 1, + sym_foreach_command, + STATE(686), 1, sym_body, ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10516,27 +10460,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(310), 1, + ACTIONS(314), 1, sym_identifier, - STATE(3), 1, + STATE(6), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, - sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, - sym_macro_command, STATE(138), 1, + sym_foreach_command, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, sym_block_command, - STATE(686), 1, + STATE(687), 1, sym_body, - ACTIONS(308), 3, + ACTIONS(312), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(130), 10, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10560,27 +10504,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(314), 1, + ACTIONS(306), 1, sym_identifier, - STATE(6), 1, + STATE(11), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, + STATE(126), 1, sym_block_command, + STATE(131), 1, + sym_macro_command, + STATE(135), 1, + sym_function_command, STATE(146), 1, + sym_while_command, + STATE(147), 1, sym_foreach_command, - STATE(687), 1, + STATE(650), 1, sym_body, - ACTIONS(312), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(153), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10604,27 +10548,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(306), 1, + ACTIONS(310), 1, sym_identifier, - STATE(11), 1, + STATE(2), 1, sym_if_command, - STATE(110), 1, - sym_foreach_command, - STATE(113), 1, - sym_macro_command, - STATE(114), 1, - sym_block_command, - STATE(125), 1, + STATE(121), 1, sym_function_command, - STATE(129), 1, + STATE(128), 1, + sym_block_command, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, sym_while_command, - STATE(652), 1, + STATE(654), 1, sym_body, - ACTIONS(304), 3, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(131), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10648,27 +10592,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(302), 1, + ACTIONS(306), 1, sym_identifier, - STATE(2), 1, + STATE(11), 1, sym_if_command, - STATE(115), 1, + STATE(126), 1, sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, - sym_function_command, - STATE(150), 1, + STATE(131), 1, sym_macro_command, - STATE(683), 1, + STATE(135), 1, + sym_function_command, + STATE(146), 1, + sym_while_command, + STATE(147), 1, + sym_foreach_command, + STATE(668), 1, sym_body, - ACTIONS(300), 3, + ACTIONS(304), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(129), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10692,27 +10636,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(298), 1, + ACTIONS(310), 1, sym_identifier, - STATE(8), 1, + STATE(2), 1, sym_if_command, - STATE(116), 1, - sym_foreach_command, - STATE(117), 1, - sym_while_command, - STATE(118), 1, + STATE(121), 1, sym_function_command, - STATE(119), 1, - sym_macro_command, - STATE(120), 1, + STATE(128), 1, sym_block_command, - STATE(659), 1, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, + STATE(667), 1, sym_body, - ACTIONS(296), 3, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10736,27 +10680,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(302), 1, + ACTIONS(294), 1, + sym_endforeach, + ACTIONS(310), 1, sym_identifier, STATE(2), 1, sym_if_command, - STATE(115), 1, - sym_block_command, - STATE(136), 1, - sym_foreach_command, - STATE(140), 1, - sym_while_command, - STATE(149), 1, + STATE(121), 1, sym_function_command, - STATE(150), 1, + STATE(128), 1, + sym_block_command, + STATE(132), 1, sym_macro_command, - STATE(651), 1, - sym_body, - ACTIONS(300), 3, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, + ACTIONS(358), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(139), 10, + STATE(134), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10780,27 +10724,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(298), 1, + ACTIONS(310), 1, sym_identifier, - STATE(8), 1, + STATE(2), 1, sym_if_command, - STATE(116), 1, - sym_foreach_command, - STATE(117), 1, - sym_while_command, - STATE(118), 1, + STATE(121), 1, sym_function_command, - STATE(119), 1, - sym_macro_command, - STATE(120), 1, + STATE(128), 1, sym_block_command, - STATE(653), 1, + STATE(132), 1, + sym_macro_command, + STATE(139), 1, + sym_foreach_command, + STATE(144), 1, + sym_while_command, + STATE(651), 1, sym_body, - ACTIONS(296), 3, + ACTIONS(308), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(155), 10, + STATE(148), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10824,27 +10768,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(310), 1, + ACTIONS(19), 1, sym_identifier, - STATE(3), 1, + ACTIONS(360), 1, + ts_builtin_sym_end, + STATE(10), 1, sym_if_command, - STATE(124), 1, - sym_foreach_command, - STATE(126), 1, + STATE(119), 1, sym_while_command, - STATE(128), 1, - sym_function_command, - STATE(134), 1, - sym_macro_command, - STATE(138), 1, + STATE(149), 1, + sym_foreach_command, + STATE(151), 1, sym_block_command, - STATE(661), 1, - sym_body, - ACTIONS(308), 3, + STATE(152), 1, + sym_macro_command, + STATE(154), 1, + sym_function_command, + ACTIONS(362), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(130), 10, + STATE(136), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10868,27 +10812,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(19), 1, + ACTIONS(314), 1, sym_identifier, - ACTIONS(360), 1, - ts_builtin_sym_end, - STATE(10), 1, + STATE(6), 1, sym_if_command, - STATE(145), 1, - sym_while_command, - STATE(147), 1, - sym_function_command, - STATE(148), 1, + STATE(138), 1, sym_foreach_command, - STATE(152), 1, - sym_block_command, - STATE(154), 1, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, sym_macro_command, - ACTIONS(362), 3, + STATE(143), 1, + sym_block_command, + STATE(663), 1, + sym_body, + ACTIONS(312), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(137), 10, + STATE(153), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10912,27 +10856,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(314), 1, + ACTIONS(298), 1, sym_identifier, - STATE(6), 1, + STATE(3), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, + STATE(110), 1, sym_macro_command, - STATE(144), 1, + STATE(124), 1, + sym_while_command, + STATE(125), 1, + sym_function_command, + STATE(137), 1, sym_block_command, - STATE(146), 1, + STATE(145), 1, sym_foreach_command, - STATE(663), 1, + STATE(660), 1, sym_body, - ACTIONS(312), 3, + ACTIONS(296), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(153), 10, + STATE(130), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -10962,21 +10906,21 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, STATE(6), 1, sym_if_command, - STATE(141), 1, - sym_while_command, - STATE(142), 1, - sym_function_command, - STATE(143), 1, - sym_macro_command, - STATE(144), 1, - sym_block_command, - STATE(146), 1, + STATE(138), 1, sym_foreach_command, + STATE(140), 1, + sym_while_command, + STATE(141), 1, + sym_function_command, + STATE(142), 1, + sym_macro_command, + STATE(143), 1, + sym_block_command, ACTIONS(364), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(121), 10, + STATE(123), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -11000,27 +10944,27 @@ static const uint16_t ts_small_parse_table[] = { sym_macro, ACTIONS(17), 1, sym_block, - ACTIONS(310), 1, + ACTIONS(302), 1, sym_identifier, - STATE(3), 1, + STATE(8), 1, sym_if_command, - STATE(124), 1, + STATE(114), 1, sym_foreach_command, - STATE(126), 1, + STATE(115), 1, sym_while_command, - STATE(128), 1, + STATE(116), 1, sym_function_command, - STATE(134), 1, + STATE(117), 1, sym_macro_command, - STATE(138), 1, + STATE(118), 1, sym_block_command, - STATE(660), 1, + STATE(659), 1, sym_body, - ACTIONS(308), 3, + ACTIONS(300), 3, sym_bracket_comment, sym_line_comment, aux_sym__untrimmed_argument_token1, - STATE(130), 10, + STATE(155), 10, sym_if_condition, sym_foreach_loop, sym_while_loop, @@ -11046,19 +10990,19 @@ static const uint16_t ts_small_parse_table[] = { sym_block, ACTIONS(294), 1, sym_endfunction, - ACTIONS(298), 1, + ACTIONS(302), 1, sym_identifier, STATE(8), 1, sym_if_command, - STATE(116), 1, + STATE(114), 1, sym_foreach_command, - STATE(117), 1, + STATE(115), 1, sym_while_command, - STATE(118), 1, + STATE(116), 1, sym_function_command, - STATE(119), 1, + STATE(117), 1, sym_macro_command, - STATE(120), 1, + STATE(118), 1, sym_block_command, ACTIONS(366), 3, sym_bracket_comment, @@ -18762,16 +18706,16 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(1415), 1, anon_sym_RBRACE, [19032] = 1, - ACTIONS(135), 1, + ACTIONS(133), 1, anon_sym_RPAREN, [19036] = 1, ACTIONS(1417), 1, anon_sym_RPAREN, [19040] = 1, - ACTIONS(141), 1, + ACTIONS(139), 1, anon_sym_RPAREN, [19044] = 1, - ACTIONS(147), 1, + ACTIONS(59), 1, anon_sym_RPAREN, [19048] = 1, ACTIONS(1419), 1, @@ -18783,22 +18727,22 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(464), 1, anon_sym_RPAREN, [19060] = 1, - ACTIONS(155), 1, + ACTIONS(151), 1, anon_sym_RPAREN, [19064] = 1, - ACTIONS(227), 1, + ACTIONS(161), 1, anon_sym_RPAREN, [19068] = 1, ACTIONS(1423), 1, anon_sym_RPAREN, [19072] = 1, - ACTIONS(169), 1, + ACTIONS(165), 1, anon_sym_RPAREN, [19076] = 1, ACTIONS(1425), 1, anon_sym_RPAREN, [19080] = 1, - ACTIONS(209), 1, + ACTIONS(169), 1, anon_sym_RPAREN, [19084] = 1, ACTIONS(1427), 1, @@ -18936,19 +18880,19 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(1499), 1, anon_sym_RBRACE, [19264] = 1, - ACTIONS(143), 1, + ACTIONS(141), 1, anon_sym_RPAREN, [19268] = 1, - ACTIONS(161), 1, + ACTIONS(155), 1, anon_sym_RPAREN, [19272] = 1, ACTIONS(1501), 1, anon_sym_RPAREN, [19276] = 1, - ACTIONS(165), 1, + ACTIONS(159), 1, anon_sym_RPAREN, [19280] = 1, - ACTIONS(153), 1, + ACTIONS(147), 1, anon_sym_RPAREN, [19284] = 1, ACTIONS(466), 1, @@ -18981,7 +18925,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(1519), 1, aux_sym_endwhile_command_token1, [19324] = 1, - ACTIONS(217), 1, + ACTIONS(215), 1, anon_sym_RPAREN, [19328] = 1, ACTIONS(1521), 1, @@ -19053,7 +18997,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(1555), 1, aux_sym_endwhile_command_token1, [19420] = 1, - ACTIONS(231), 1, + ACTIONS(229), 1, anon_sym_RPAREN, [19424] = 1, ACTIONS(1557), 1, @@ -19065,7 +19009,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(1561), 1, anon_sym_RPAREN, [19436] = 1, - ACTIONS(229), 1, + ACTIONS(231), 1, anon_sym_RPAREN, [19440] = 1, ACTIONS(1563), 1, @@ -20143,7 +20087,7 @@ static const TSParseActionEntry ts_parse_actions[] = { [0] = {.entry = {.count = 0, .reusable = false}}, [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(), [3] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 0), - [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(151), + [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(150), [7] = {.entry = {.count = 1, .reusable = false}}, SHIFT(583), [9] = {.entry = {.count = 1, .reusable = false}}, SHIFT(550), [11] = {.entry = {.count = 1, .reusable = false}}, SHIFT(640), @@ -20164,13 +20108,13 @@ static const TSParseActionEntry ts_parse_actions[] = { [41] = {.entry = {.count = 1, .reusable = false}}, SHIFT(634), [43] = {.entry = {.count = 1, .reusable = true}}, SHIFT(241), [45] = {.entry = {.count = 1, .reusable = true}}, SHIFT(209), - [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98), - [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97), + [47] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99), + [49] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98), [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(439), [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(198), [55] = {.entry = {.count = 1, .reusable = false}}, SHIFT(163), [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(240), - [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424), + [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465), [61] = {.entry = {.count = 1, .reusable = true}}, SHIFT(388), [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(395), [65] = {.entry = {.count = 1, .reusable = true}}, SHIFT(366), @@ -20206,26 +20150,26 @@ static const TSParseActionEntry ts_parse_actions[] = { [125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(352), [127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(412), [129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(425), - [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315), - [133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460), - [135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432), - [137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469), - [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433), - [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435), - [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(340), + [131] = {.entry = {.count = 1, .reusable = true}}, SHIFT(460), + [133] = {.entry = {.count = 1, .reusable = true}}, SHIFT(432), + [135] = {.entry = {.count = 1, .reusable = true}}, SHIFT(469), + [137] = {.entry = {.count = 1, .reusable = true}}, SHIFT(433), + [139] = {.entry = {.count = 1, .reusable = true}}, SHIFT(435), + [141] = {.entry = {.count = 1, .reusable = true}}, SHIFT(340), + [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438), [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(468), - [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(465), + [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376), [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(467), - [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(438), - [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(376), - [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277), + [151] = {.entry = {.count = 1, .reusable = true}}, SHIFT(277), + [153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440), + [155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339), [157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(473), - [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(440), - [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(339), + [159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338), + [161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(445), [163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(249), - [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(338), + [165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446), [167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(464), - [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(446), + [169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447), [171] = {.entry = {.count = 1, .reusable = true}}, SHIFT(457), [173] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_if_condition_repeat1, 2), SHIFT_REPEAT(108), [176] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_condition_repeat1, 2), SHIFT_REPEAT(583), @@ -20240,31 +20184,31 @@ static const TSParseActionEntry ts_parse_actions[] = { [202] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_if_condition_repeat1, 2), SHIFT_REPEAT(617), [205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(448), [207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(441), - [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(447), - [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(332), - [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331), - [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330), - [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327), + [209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(332), + [211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(331), + [213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(330), + [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(327), + [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324), [219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(434), [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(301), - [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(324), + [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(315), [225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(323), - [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(445), - [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302), - [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303), - [233] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(241), - [236] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(209), - [239] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(95), - [242] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(97), - [245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), - [247] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(198), - [250] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(163), - [253] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(240), - [256] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104), - [258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243), - [260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95), - [262] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 1), - [264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238), + [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(424), + [229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(303), + [231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(302), + [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95), + [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(238), + [237] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(241), + [240] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(209), + [243] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(95), + [246] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(98), + [249] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), + [251] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(198), + [254] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(163), + [257] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__paren_argument_repeat1, 2), SHIFT_REPEAT(240), + [260] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90), + [262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(243), + [264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_argument_list, 1), [266] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(107), [269] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(583), [272] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), @@ -20276,35 +20220,35 @@ static const TSParseActionEntry ts_parse_actions[] = { [289] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(617), [292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107), [294] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_body, 1), - [296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155), - [298] = {.entry = {.count = 1, .reusable = false}}, SHIFT(554), - [300] = {.entry = {.count = 1, .reusable = true}}, SHIFT(139), - [302] = {.entry = {.count = 1, .reusable = false}}, SHIFT(603), - [304] = {.entry = {.count = 1, .reusable = true}}, SHIFT(131), + [296] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130), + [298] = {.entry = {.count = 1, .reusable = false}}, SHIFT(533), + [300] = {.entry = {.count = 1, .reusable = true}}, SHIFT(155), + [302] = {.entry = {.count = 1, .reusable = false}}, SHIFT(554), + [304] = {.entry = {.count = 1, .reusable = true}}, SHIFT(129), [306] = {.entry = {.count = 1, .reusable = false}}, SHIFT(581), - [308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(130), - [310] = {.entry = {.count = 1, .reusable = false}}, SHIFT(533), + [308] = {.entry = {.count = 1, .reusable = true}}, SHIFT(148), + [310] = {.entry = {.count = 1, .reusable = false}}, SHIFT(603), [312] = {.entry = {.count = 1, .reusable = true}}, SHIFT(153), [314] = {.entry = {.count = 1, .reusable = false}}, SHIFT(566), - [316] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(121), - [319] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(566), - [322] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(122), - [325] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(581), + [316] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(120), + [319] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(581), + [322] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(123), + [325] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(566), [328] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(127), [331] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(533), - [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127), - [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(122), + [334] = {.entry = {.count = 1, .reusable = true}}, SHIFT(120), + [336] = {.entry = {.count = 1, .reusable = true}}, SHIFT(127), [338] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(133), [341] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(554), - [344] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(135), + [344] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(134), [347] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(603), [350] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), - [352] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(137), + [352] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(136), [355] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(635), - [358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(135), + [358] = {.entry = {.count = 1, .reusable = true}}, SHIFT(134), [360] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1), - [362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(137), - [364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(121), + [362] = {.entry = {.count = 1, .reusable = true}}, SHIFT(136), + [364] = {.entry = {.count = 1, .reusable = true}}, SHIFT(123), [366] = {.entry = {.count = 1, .reusable = true}}, SHIFT(133), [368] = {.entry = {.count = 1, .reusable = true}}, SHIFT(488), [370] = {.entry = {.count = 1, .reusable = true}}, SHIFT(247), @@ -20561,7 +20505,7 @@ static const TSParseActionEntry ts_parse_actions[] = { [908] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_command, 5), [910] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__unquoted_text_repeat1, 2), SHIFT_REPEAT(491), [913] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym__unquoted_text_repeat1, 2), SHIFT_REPEAT(491), - [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101), + [916] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91), [918] = {.entry = {.count = 1, .reusable = true}}, SHIFT(532), [920] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34), [922] = {.entry = {.count = 1, .reusable = true}}, SHIFT(560), @@ -20581,7 +20525,7 @@ static const TSParseActionEntry ts_parse_actions[] = { [950] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_if_command_repeat1, 2), SHIFT_REPEAT(532), [953] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18), [955] = {.entry = {.count = 1, .reusable = true}}, SHIFT(531), - [957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64), + [957] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61), [959] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38), [961] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36), [963] = {.entry = {.count = 1, .reusable = true}}, SHIFT(677), @@ -20600,12 +20544,12 @@ static const TSParseActionEntry ts_parse_actions[] = { [989] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47), [991] = {.entry = {.count = 1, .reusable = true}}, SHIFT(545), [993] = {.entry = {.count = 1, .reusable = true}}, SHIFT(49), - [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90), - [997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65), - [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92), + [995] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106), + [997] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63), + [999] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93), [1001] = {.entry = {.count = 1, .reusable = true}}, SHIFT(631), [1003] = {.entry = {.count = 1, .reusable = true}}, SHIFT(172), - [1005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(61), + [1005] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17), [1007] = {.entry = {.count = 1, .reusable = true}}, SHIFT(669), [1009] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50), [1011] = {.entry = {.count = 1, .reusable = true}}, SHIFT(547), @@ -20613,21 +20557,21 @@ static const TSParseActionEntry ts_parse_actions[] = { [1015] = {.entry = {.count = 1, .reusable = true}}, SHIFT(629), [1017] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43), [1019] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44), - [1021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59), - [1023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68), + [1021] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58), + [1023] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65), [1025] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51), - [1027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70), + [1027] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67), [1029] = {.entry = {.count = 1, .reusable = true}}, SHIFT(674), [1031] = {.entry = {.count = 1, .reusable = true}}, SHIFT(179), [1033] = {.entry = {.count = 1, .reusable = true}}, SHIFT(675), [1035] = {.entry = {.count = 1, .reusable = true}}, SHIFT(626), - [1037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78), + [1037] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77), [1039] = {.entry = {.count = 1, .reusable = true}}, SHIFT(558), [1041] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52), [1043] = {.entry = {.count = 1, .reusable = true}}, SHIFT(576), - [1045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79), + [1045] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78), [1047] = {.entry = {.count = 1, .reusable = true}}, SHIFT(559), - [1049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80), + [1049] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79), [1051] = {.entry = {.count = 1, .reusable = true}}, SHIFT(561), [1053] = {.entry = {.count = 1, .reusable = true}}, SHIFT(673), [1055] = {.entry = {.count = 1, .reusable = true}}, SHIFT(562), @@ -20635,36 +20579,36 @@ static const TSParseActionEntry ts_parse_actions[] = { [1059] = {.entry = {.count = 1, .reusable = true}}, SHIFT(563), [1061] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71), [1063] = {.entry = {.count = 1, .reusable = true}}, SHIFT(552), - [1065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81), + [1065] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80), [1067] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69), [1069] = {.entry = {.count = 1, .reusable = true}}, SHIFT(549), - [1071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84), + [1071] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81), [1073] = {.entry = {.count = 1, .reusable = true}}, SHIFT(572), [1075] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85), - [1077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55), - [1079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56), + [1077] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54), + [1079] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55), [1081] = {.entry = {.count = 1, .reusable = true}}, SHIFT(622), - [1083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57), + [1083] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56), [1085] = {.entry = {.count = 1, .reusable = true}}, SHIFT(580), - [1087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54), + [1087] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53), [1089] = {.entry = {.count = 1, .reusable = true}}, SHIFT(620), - [1091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58), - [1093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53), + [1091] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57), + [1093] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84), [1095] = {.entry = {.count = 1, .reusable = true}}, SHIFT(575), - [1097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17), + [1097] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86), [1099] = {.entry = {.count = 1, .reusable = true}}, SHIFT(638), - [1101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91), + [1101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92), [1103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(632), [1105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(175), [1107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(604), [1109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(676), [1111] = {.entry = {.count = 1, .reusable = true}}, SHIFT(609), - [1113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88), - [1115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87), + [1113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87), + [1115] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88), [1117] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83), [1119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(666), [1121] = {.entry = {.count = 1, .reusable = true}}, SHIFT(170), - [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63), + [1123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59), [1125] = {.entry = {.count = 1, .reusable = true}}, SHIFT(616), [1127] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82), [1129] = {.entry = {.count = 1, .reusable = true}}, SHIFT(586), @@ -20682,9 +20626,9 @@ static const TSParseActionEntry ts_parse_actions[] = { [1153] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16), [1155] = {.entry = {.count = 1, .reusable = true}}, SHIFT(619), [1157] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60), - [1159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67), + [1159] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64), [1161] = {.entry = {.count = 1, .reusable = true}}, SHIFT(623), - [1163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106), + [1163] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105), [1165] = {.entry = {.count = 1, .reusable = true}}, SHIFT(548), [1167] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48), [1169] = {.entry = {.count = 1, .reusable = true}}, SHIFT(600), @@ -20705,40 +20649,40 @@ static const TSParseActionEntry ts_parse_actions[] = { [1199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(608), [1201] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33), [1203] = {.entry = {.count = 1, .reusable = true}}, SHIFT(607), - [1205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86), + [1205] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68), [1207] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24), [1209] = {.entry = {.count = 1, .reusable = true}}, SHIFT(633), [1211] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40), [1213] = {.entry = {.count = 1, .reusable = true}}, SHIFT(606), - [1215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72), + [1215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70), [1217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39), [1219] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__gen_exp_content, 1), [1221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(157), [1223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23), - [1225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77), + [1225] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72), [1227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66), [1229] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41), [1231] = {.entry = {.count = 1, .reusable = true}}, SHIFT(605), [1233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(678), - [1235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103), - [1237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105), + [1235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104), + [1237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89), [1239] = {.entry = {.count = 1, .reusable = true}}, SHIFT(167), - [1241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102), - [1243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100), - [1245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99), + [1241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103), + [1243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102), + [1245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100), [1247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27), [1249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29), [1251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(611), [1253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32), [1255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(624), - [1257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96), + [1257] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97), [1259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(627), - [1261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94), + [1261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101), [1263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(628), [1265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37), - [1267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93), + [1267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96), [1269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(630), - [1271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(89), + [1271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94), [1273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(521), [1275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(544), [1277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(365), @@ -20937,6 +20881,33 @@ static const TSParseActionEntry ts_parse_actions[] = { [1663] = {.entry = {.count = 1, .reusable = true}}, SHIFT(497), }; +enum ts_external_scanner_symbol_identifiers { + ts_external_token_bracket_argument = 0, + ts_external_token_bracket_comment = 1, + ts_external_token_line_comment = 2, +}; + +static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = { + [ts_external_token_bracket_argument] = sym_bracket_argument, + [ts_external_token_bracket_comment] = sym_bracket_comment, + [ts_external_token_line_comment] = sym_line_comment, +}; + +static const bool ts_external_scanner_states[4][EXTERNAL_TOKEN_COUNT] = { + [1] = { + [ts_external_token_bracket_argument] = true, + [ts_external_token_bracket_comment] = true, + [ts_external_token_line_comment] = true, + }, + [2] = { + [ts_external_token_bracket_comment] = true, + [ts_external_token_line_comment] = true, + }, + [3] = { + [ts_external_token_bracket_argument] = true, + }, +}; + #ifdef __cplusplus extern "C" { #endif diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h index 2b14ac1..17b4fde 100644 --- a/src/tree_sitter/parser.h +++ b/src/tree_sitter/parser.h @@ -13,9 +13,8 @@ extern "C" { #define ts_builtin_sym_end 0 #define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024 -typedef uint16_t TSStateId; - #ifndef TREE_SITTER_API_H_ +typedef uint16_t TSStateId; typedef uint16_t TSSymbol; typedef uint16_t TSFieldId; typedef struct TSLanguage TSLanguage; @@ -130,9 +129,16 @@ struct TSLanguage { * Lexer Macros */ +#ifdef _MSC_VER +#define UNUSED __pragma(warning(suppress : 4101)) +#else +#define UNUSED __attribute__((unused)) +#endif + #define START_LEXER() \ bool result = false; \ bool skip = false; \ + UNUSED \ bool eof = false; \ int32_t lookahead; \ goto start; \ @@ -166,7 +172,7 @@ struct TSLanguage { * Parse Table Macros */ -#define SMALL_STATE(id) id - LARGE_STATE_COUNT +#define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT) #define STATE(id) id @@ -176,7 +182,7 @@ struct TSLanguage { {{ \ .shift = { \ .type = TSParseActionTypeShift, \ - .state = state_value \ + .state = (state_value) \ } \ }} @@ -184,7 +190,7 @@ struct TSLanguage { {{ \ .shift = { \ .type = TSParseActionTypeShift, \ - .state = state_value, \ + .state = (state_value), \ .repetition = true \ } \ }}