From 81667424930b7097a716141b64b1a9a0581b1d94 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Tue, 23 Apr 2024 15:23:06 +0000 Subject: [PATCH] Remove trailing commas in 'select_value' arguments --- grammar.js | 6 +- src/grammar.json | 12 - src/parser.c | 1471 +++++++++++++++++++--------------------- test/corpus/select.txt | 28 + 4 files changed, 738 insertions(+), 779 deletions(-) diff --git a/grammar.js b/grammar.js index 58b9b19..9f68be4 100644 --- a/grammar.js +++ b/grammar.js @@ -2,6 +2,10 @@ function commaSeparated(elem) { return seq(elem, repeat(seq(",", elem)), optional(",")) } +function commaSeparatedNoTrailing(elem) { + return seq(elem, repeat(seq(",", elem))) +} + function trailingCommaSeparated(elem) { return repeat(seq(elem, ",")) } @@ -130,7 +134,7 @@ module.exports = grammar({ select_value: ($) => seq( field("name", $.identifier), "(", - field("arguments", optional(commaSeparated($._string_literal))), + field("arguments", optional(commaSeparatedNoTrailing($._string_literal))), ")", ), diff --git a/src/grammar.json b/src/grammar.json index 83b9867..89b43b4 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -529,18 +529,6 @@ } ] } - }, - { - "type": "CHOICE", - "members": [ - { - "type": "STRING", - "value": "," - }, - { - "type": "BLANK" - } - ] } ] }, diff --git a/src/parser.c b/src/parser.c index 82034c5..1fab250 100644 --- a/src/parser.c +++ b/src/parser.c @@ -5,7 +5,7 @@ #endif #define LANGUAGE_VERSION 14 -#define STATE_COUNT 117 +#define STATE_COUNT 114 #define LARGE_STATE_COUNT 2 #define SYMBOL_COUNT 59 #define ALIAS_COUNT 0 @@ -13,7 +13,7 @@ #define EXTERNAL_TOKEN_COUNT 0 #define FIELD_COUNT 11 #define MAX_ALIAS_SEQUENCE_LENGTH 6 -#define PRODUCTION_ID_COUNT 19 +#define PRODUCTION_ID_COUNT 18 enum ts_symbol_identifiers { anon_sym_SLASH_SLASH = 1, @@ -485,8 +485,7 @@ static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = { [14] = {.index = 31, .length = 1}, [15] = {.index = 32, .length = 2}, [16] = {.index = 34, .length = 3}, - [17] = {.index = 37, .length = 4}, - [18] = {.index = 41, .length = 2}, + [17] = {.index = 37, .length = 2}, }; static const TSFieldMapEntry ts_field_map_entries[] = { @@ -543,11 +542,6 @@ static const TSFieldMapEntry ts_field_map_entries[] = { {field_arguments, 3}, {field_name, 0}, [37] = - {field_arguments, 2}, - {field_arguments, 3}, - {field_arguments, 4}, - {field_name, 0}, - [41] = {field_pattern, 0}, {field_value, 2}, }; @@ -678,9 +672,6 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = { [111] = 111, [112] = 112, [113] = 113, - [114] = 114, - [115] = 115, - [116] = 116, }; static inline bool sym_identifier_character_set_1(int32_t c) { @@ -4153,53 +4144,53 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [34] = {.lex_state = 37}, [35] = {.lex_state = 5}, [36] = {.lex_state = 37}, - [37] = {.lex_state = 37}, - [38] = {.lex_state = 37}, + [37] = {.lex_state = 3}, + [38] = {.lex_state = 1}, [39] = {.lex_state = 1}, - [40] = {.lex_state = 37}, - [41] = {.lex_state = 1}, - [42] = {.lex_state = 3}, - [43] = {.lex_state = 37}, - [44] = {.lex_state = 1}, - [45] = {.lex_state = 37}, - [46] = {.lex_state = 37}, + [40] = {.lex_state = 1}, + [41] = {.lex_state = 37}, + [42] = {.lex_state = 37}, + [43] = {.lex_state = 0}, + [44] = {.lex_state = 37}, + [45] = {.lex_state = 0}, + [46] = {.lex_state = 1}, [47] = {.lex_state = 0}, - [48] = {.lex_state = 0}, - [49] = {.lex_state = 37}, - [50] = {.lex_state = 37}, - [51] = {.lex_state = 0}, + [48] = {.lex_state = 37}, + [49] = {.lex_state = 0}, + [50] = {.lex_state = 0}, + [51] = {.lex_state = 37}, [52] = {.lex_state = 37}, - [53] = {.lex_state = 37}, - [54] = {.lex_state = 0}, - [55] = {.lex_state = 37}, + [53] = {.lex_state = 0}, + [54] = {.lex_state = 37}, + [55] = {.lex_state = 0}, [56] = {.lex_state = 0}, [57] = {.lex_state = 37}, - [58] = {.lex_state = 1}, - [59] = {.lex_state = 0}, - [60] = {.lex_state = 0}, + [58] = {.lex_state = 37}, + [59] = {.lex_state = 37}, + [60] = {.lex_state = 37}, [61] = {.lex_state = 0}, - [62] = {.lex_state = 37}, + [62] = {.lex_state = 0}, [63] = {.lex_state = 37}, [64] = {.lex_state = 0}, - [65] = {.lex_state = 37}, + [65] = {.lex_state = 0}, [66] = {.lex_state = 37}, - [67] = {.lex_state = 0}, + [67] = {.lex_state = 37}, [68] = {.lex_state = 0}, [69] = {.lex_state = 37}, - [70] = {.lex_state = 0}, - [71] = {.lex_state = 0}, + [70] = {.lex_state = 37}, + [71] = {.lex_state = 37}, [72] = {.lex_state = 37}, [73] = {.lex_state = 37}, - [74] = {.lex_state = 37}, + [74] = {.lex_state = 0}, [75] = {.lex_state = 37}, - [76] = {.lex_state = 0}, + [76] = {.lex_state = 37}, [77] = {.lex_state = 37}, - [78] = {.lex_state = 0}, + [78] = {.lex_state = 37}, [79] = {.lex_state = 0}, [80] = {.lex_state = 37}, [81] = {.lex_state = 37}, [82] = {.lex_state = 37}, - [83] = {.lex_state = 37}, + [83] = {.lex_state = 0}, [84] = {.lex_state = 37}, [85] = {.lex_state = 37}, [86] = {.lex_state = 37}, @@ -4207,14 +4198,14 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [88] = {.lex_state = 37}, [89] = {.lex_state = 37}, [90] = {.lex_state = 37}, - [91] = {.lex_state = 37}, + [91] = {.lex_state = 0}, [92] = {.lex_state = 0}, - [93] = {.lex_state = 37}, + [93] = {.lex_state = 0}, [94] = {.lex_state = 0}, [95] = {.lex_state = 0}, [96] = {.lex_state = 0}, [97] = {.lex_state = 0}, - [98] = {.lex_state = 0}, + [98] = {.lex_state = 44}, [99] = {.lex_state = 0}, [100] = {.lex_state = 0}, [101] = {.lex_state = 0}, @@ -4225,14 +4216,11 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { [106] = {.lex_state = 0}, [107] = {.lex_state = 0}, [108] = {.lex_state = 0}, - [109] = {.lex_state = 44}, - [110] = {.lex_state = 0}, + [109] = {.lex_state = 0}, + [110] = {.lex_state = 7}, [111] = {.lex_state = 0}, - [112] = {.lex_state = 0}, - [113] = {.lex_state = 7}, - [114] = {.lex_state = 0}, - [115] = {(TSStateId)(-1)}, - [116] = {(TSStateId)(-1)}, + [112] = {(TSStateId)(-1)}, + [113] = {(TSStateId)(-1)}, }; static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { @@ -4267,13 +4255,13 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [anon_sym_PLUS] = ACTIONS(1), }, [1] = { - [sym_source_file] = STATE(111), - [sym__definition] = STATE(81), + [sym_source_file] = STATE(108), + [sym__definition] = STATE(80), [sym_comment] = STATE(1), - [sym_assignment] = STATE(82), - [sym_module] = STATE(82), + [sym_assignment] = STATE(84), + [sym_module] = STATE(84), [sym__old_module] = STATE(89), - [sym__new_module] = STATE(73), + [sym__new_module] = STATE(81), [aux_sym_source_file_repeat1] = STATE(15), [ts_builtin_sym_end] = ACTIONS(7), [anon_sym_SLASH_SLASH] = ACTIONS(3), @@ -4308,16 +4296,16 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(2), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(80), 1, + STATE(76), 1, sym__expr, - STATE(98), 1, + STATE(95), 1, sym__case_value, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4350,14 +4338,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_RBRACK, STATE(3), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(43), 1, + STATE(59), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4390,14 +4378,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_RBRACK, STATE(4), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(57), 1, + STATE(59), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4430,14 +4418,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_RBRACK, STATE(5), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(57), 1, + STATE(42), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4468,14 +4456,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(6), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(57), 1, + STATE(69), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4506,14 +4494,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(7), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(30), 1, + STATE(63), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4544,14 +4532,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(8), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(62), 1, + STATE(59), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4582,14 +4570,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(9), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(49), 1, + STATE(20), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4620,14 +4608,14 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACK, STATE(10), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(65), 1, + STATE(60), 1, sym__expr, ACTIONS(15), 2, anon_sym_true, anon_sym_false, - STATE(21), 7, + STATE(25), 7, sym_boolean_literal, sym_integer_literal, sym__string_literal, @@ -4648,9 +4636,9 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_DQUOTE, ACTIONS(48), 1, anon_sym_default, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(106), 1, + STATE(101), 1, sym_select_case, ACTIONS(39), 2, anon_sym_true, @@ -4674,13 +4662,13 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_RBRACE, ACTIONS(55), 1, anon_sym_default, + STATE(11), 1, + aux_sym_select_cases_repeat1, STATE(12), 1, sym_comment, - STATE(13), 1, - aux_sym_select_cases_repeat1, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(106), 1, + STATE(101), 1, sym_select_case, ACTIONS(53), 2, anon_sym_true, @@ -4701,13 +4689,13 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_default, ACTIONS(57), 1, anon_sym_RBRACE, - STATE(11), 1, + STATE(12), 1, aux_sym_select_cases_repeat1, STATE(13), 1, sym_comment, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, - STATE(106), 1, + STATE(101), 1, sym_select_case, ACTIONS(53), 2, anon_sym_true, @@ -4744,13 +4732,13 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, STATE(17), 1, aux_sym_source_file_repeat1, - STATE(73), 1, - sym__new_module, - STATE(81), 1, + STATE(80), 1, sym__definition, + STATE(81), 1, + sym__new_module, STATE(89), 1, sym__old_module, - STATE(82), 2, + STATE(84), 2, sym_assignment, sym_module, [659] = 4, @@ -4778,16 +4766,16 @@ static const uint16_t ts_small_parse_table[] = { ts_builtin_sym_end, ACTIONS(67), 1, sym_identifier, - STATE(73), 1, - sym__new_module, - STATE(81), 1, + STATE(80), 1, sym__definition, + STATE(81), 1, + sym__new_module, STATE(89), 1, sym__old_module, STATE(17), 2, sym_comment, aux_sym_source_file_repeat1, - STATE(82), 2, + STATE(84), 2, sym_assignment, sym_module, [709] = 4, @@ -5072,212 +5060,176 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_DQUOTE, ACTIONS(104), 1, anon_sym_RPAREN, - STATE(18), 1, + STATE(19), 1, sym_interpreted_string_literal, STATE(36), 1, sym_comment, - STATE(92), 1, + STATE(56), 1, sym__string_literal, - [1077] = 8, + [1077] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(21), 1, - sym_raw_string_literal, - ACTIONS(23), 1, - anon_sym_DQUOTE, - ACTIONS(106), 1, - anon_sym_RPAREN, - STATE(18), 1, - sym_interpreted_string_literal, + ACTIONS(108), 1, + anon_sym_LBRACE, + ACTIONS(110), 1, + anon_sym_LPAREN, STATE(37), 1, sym_comment, - STATE(47), 1, - sym__string_literal, - [1102] = 8, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(21), 1, - sym_raw_string_literal, - ACTIONS(23), 1, - anon_sym_DQUOTE, - ACTIONS(108), 1, - anon_sym_RPAREN, - STATE(18), 1, - sym_interpreted_string_literal, - STATE(38), 1, - sym_comment, - STATE(92), 1, - sym__string_literal, - [1127] = 7, - ACTIONS(110), 1, - anon_sym_SLASH_SLASH, - ACTIONS(112), 1, - anon_sym_SLASH_STAR, - ACTIONS(114), 1, - aux_sym_interpreted_string_literal_token1, - ACTIONS(116), 1, - anon_sym_DQUOTE2, - ACTIONS(118), 1, - sym_escape_sequence, - STATE(39), 1, - sym_comment, - STATE(41), 1, - aux_sym_interpreted_string_literal_repeat1, - [1149] = 7, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(21), 1, - sym_raw_string_literal, - ACTIONS(23), 1, - anon_sym_DQUOTE, - STATE(18), 1, - sym_interpreted_string_literal, - STATE(40), 1, - sym_comment, - STATE(92), 1, - sym__string_literal, - [1171] = 7, - ACTIONS(110), 1, - anon_sym_SLASH_SLASH, - ACTIONS(112), 1, - anon_sym_SLASH_STAR, - ACTIONS(114), 1, - aux_sym_interpreted_string_literal_token1, - ACTIONS(118), 1, - sym_escape_sequence, - ACTIONS(120), 1, - anon_sym_DQUOTE2, - STATE(41), 1, - sym_comment, - STATE(44), 1, - aux_sym_interpreted_string_literal_repeat1, - [1193] = 6, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(124), 1, - anon_sym_LBRACE, - ACTIONS(126), 1, - anon_sym_LPAREN, - STATE(42), 1, - sym_comment, - ACTIONS(122), 2, + ACTIONS(106), 2, anon_sym_EQ, anon_sym_PLUS_EQ, - [1213] = 7, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(128), 1, - anon_sym_COMMA, - ACTIONS(130), 1, - anon_sym_RBRACK, - ACTIONS(132), 1, - anon_sym_PLUS, - STATE(43), 1, - sym_comment, - STATE(60), 1, - aux_sym_list_expression_repeat1, - [1235] = 6, - ACTIONS(110), 1, - anon_sym_SLASH_SLASH, + [1097] = 7, ACTIONS(112), 1, + anon_sym_SLASH_SLASH, + ACTIONS(114), 1, anon_sym_SLASH_STAR, - ACTIONS(134), 1, + ACTIONS(116), 1, aux_sym_interpreted_string_literal_token1, - ACTIONS(137), 1, + ACTIONS(118), 1, anon_sym_DQUOTE2, - ACTIONS(139), 1, + ACTIONS(120), 1, sym_escape_sequence, - STATE(44), 2, + STATE(38), 1, + sym_comment, + STATE(39), 1, + aux_sym_interpreted_string_literal_repeat1, + [1119] = 7, + ACTIONS(112), 1, + anon_sym_SLASH_SLASH, + ACTIONS(114), 1, + anon_sym_SLASH_STAR, + ACTIONS(116), 1, + aux_sym_interpreted_string_literal_token1, + ACTIONS(120), 1, + sym_escape_sequence, + ACTIONS(122), 1, + anon_sym_DQUOTE2, + STATE(39), 1, + sym_comment, + STATE(40), 1, + aux_sym_interpreted_string_literal_repeat1, + [1141] = 6, + ACTIONS(112), 1, + anon_sym_SLASH_SLASH, + ACTIONS(114), 1, + anon_sym_SLASH_STAR, + ACTIONS(124), 1, + aux_sym_interpreted_string_literal_token1, + ACTIONS(127), 1, + anon_sym_DQUOTE2, + ACTIONS(129), 1, + sym_escape_sequence, + STATE(40), 2, sym_comment, aux_sym_interpreted_string_literal_repeat1, - [1255] = 6, + [1161] = 7, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(142), 1, - anon_sym_RBRACE, - ACTIONS(144), 1, - sym_identifier, - STATE(45), 1, + ACTIONS(21), 1, + sym_raw_string_literal, + ACTIONS(23), 1, + anon_sym_DQUOTE, + STATE(19), 1, + sym_interpreted_string_literal, + STATE(41), 1, sym_comment, - STATE(76), 1, - sym__colon_property, - [1274] = 6, + STATE(83), 1, + sym__string_literal, + [1183] = 7, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(144), 1, - sym_identifier, - ACTIONS(146), 1, - anon_sym_RBRACE, - STATE(46), 1, + ACTIONS(132), 1, + anon_sym_COMMA, + ACTIONS(134), 1, + anon_sym_RBRACK, + ACTIONS(136), 1, + anon_sym_PLUS, + STATE(42), 1, sym_comment, STATE(61), 1, - sym__colon_property, - [1293] = 6, + aux_sym_list_expression_repeat1, + [1205] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(148), 1, + ACTIONS(138), 1, anon_sym_COMMA, - ACTIONS(150), 1, - anon_sym_RPAREN, - STATE(47), 1, + ACTIONS(141), 1, + anon_sym_RBRACK, + STATE(43), 2, sym_comment, - STATE(59), 1, - aux_sym_select_value_repeat1, - [1312] = 6, + aux_sym_list_expression_repeat1, + [1222] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(152), 1, + ACTIONS(143), 1, + anon_sym_RBRACE, + ACTIONS(145), 1, + sym_identifier, + STATE(44), 1, + sym_comment, + STATE(91), 1, + sym__colon_property, + [1241] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(147), 1, anon_sym_COMMA, - ACTIONS(154), 1, + ACTIONS(149), 1, + anon_sym_RBRACE, + STATE(45), 1, + sym_comment, + STATE(55), 1, + aux_sym__old_module_repeat1, + [1260] = 5, + ACTIONS(112), 1, + anon_sym_SLASH_SLASH, + ACTIONS(114), 1, + anon_sym_SLASH_STAR, + ACTIONS(151), 1, + aux_sym_interpreted_string_literal_token1, + STATE(46), 1, + sym_comment, + ACTIONS(153), 2, + anon_sym_DQUOTE2, + sym_escape_sequence, + [1277] = 5, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(155), 1, + anon_sym_COMMA, + ACTIONS(158), 1, + anon_sym_RPAREN, + STATE(47), 2, + sym_comment, + aux_sym_select_value_repeat1, + [1294] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(145), 1, + sym_identifier, + ACTIONS(160), 1, anon_sym_RBRACE, STATE(48), 1, sym_comment, - STATE(64), 1, - aux_sym__old_module_repeat1, - [1331] = 5, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(132), 1, - anon_sym_PLUS, - STATE(49), 1, - sym_comment, - ACTIONS(156), 2, - ts_builtin_sym_end, - sym_identifier, - [1348] = 6, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(158), 1, - anon_sym_RPAREN, - ACTIONS(160), 1, - sym_identifier, - STATE(50), 1, - sym_comment, - STATE(78), 1, - sym__equal_property, - [1367] = 6, + STATE(91), 1, + sym__colon_property, + [1313] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5286,200 +5238,203 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_COMMA, ACTIONS(164), 1, anon_sym_RPAREN, - STATE(51), 1, + STATE(47), 1, + aux_sym_select_value_repeat1, + STATE(49), 1, sym_comment, - STATE(67), 1, - aux_sym__new_module_repeat1, - [1386] = 6, + [1332] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(144), 1, - sym_identifier, ACTIONS(166), 1, - anon_sym_RBRACE, - STATE(52), 1, - sym_comment, - STATE(76), 1, - sym__colon_property, - [1405] = 6, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(144), 1, - sym_identifier, + anon_sym_COMMA, ACTIONS(168), 1, anon_sym_RBRACE, - STATE(53), 1, + STATE(50), 1, sym_comment, - STATE(71), 1, - sym__colon_property, - [1424] = 6, + STATE(68), 1, + aux_sym__old_module_repeat1, + [1351] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(170), 1, - anon_sym_COMMA, + anon_sym_RPAREN, ACTIONS(172), 1, - anon_sym_RBRACE, - STATE(54), 1, + sym_identifier, + STATE(51), 1, sym_comment, - STATE(64), 1, - aux_sym__old_module_repeat1, - [1443] = 6, + STATE(74), 1, + sym__equal_property, + [1370] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(160), 1, + ACTIONS(145), 1, sym_identifier, ACTIONS(174), 1, - anon_sym_RPAREN, - STATE(55), 1, + anon_sym_RBRACE, + STATE(52), 1, sym_comment, - STATE(70), 1, - sym__equal_property, - [1462] = 5, + STATE(62), 1, + sym__colon_property, + [1389] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(176), 1, anon_sym_COMMA, - ACTIONS(179), 1, - anon_sym_RBRACK, - STATE(56), 2, - sym_comment, - aux_sym_list_expression_repeat1, - [1479] = 5, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(132), 1, - anon_sym_PLUS, - STATE(57), 1, - sym_comment, - ACTIONS(181), 2, - anon_sym_COMMA, - anon_sym_RBRACK, - [1496] = 5, - ACTIONS(110), 1, - anon_sym_SLASH_SLASH, - ACTIONS(112), 1, - anon_sym_SLASH_STAR, - ACTIONS(183), 1, - aux_sym_interpreted_string_literal_token1, - STATE(58), 1, - sym_comment, - ACTIONS(185), 2, - anon_sym_DQUOTE2, - sym_escape_sequence, - [1513] = 6, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(104), 1, + ACTIONS(178), 1, anon_sym_RPAREN, - ACTIONS(187), 1, + STATE(53), 1, + sym_comment, + STATE(65), 1, + aux_sym__new_module_repeat1, + [1408] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(145), 1, + sym_identifier, + ACTIONS(180), 1, + anon_sym_RBRACE, + STATE(54), 1, + sym_comment, + STATE(91), 1, + sym__colon_property, + [1427] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(182), 1, anon_sym_COMMA, - STATE(59), 1, + ACTIONS(184), 1, + anon_sym_RBRACE, + STATE(55), 1, sym_comment, STATE(68), 1, - aux_sym_select_value_repeat1, - [1532] = 6, + aux_sym__old_module_repeat1, + [1446] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(189), 1, + ACTIONS(162), 1, anon_sym_COMMA, - ACTIONS(191), 1, - anon_sym_RBRACK, + ACTIONS(186), 1, + anon_sym_RPAREN, + STATE(49), 1, + aux_sym_select_value_repeat1, STATE(56), 1, - aux_sym_list_expression_repeat1, + sym_comment, + [1465] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(172), 1, + sym_identifier, + ACTIONS(188), 1, + anon_sym_RPAREN, + STATE(57), 1, + sym_comment, + STATE(64), 1, + sym__equal_property, + [1484] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(145), 1, + sym_identifier, + ACTIONS(190), 1, + anon_sym_RBRACE, + STATE(45), 1, + sym__colon_property, + STATE(58), 1, + sym_comment, + [1503] = 5, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(136), 1, + anon_sym_PLUS, + STATE(59), 1, + sym_comment, + ACTIONS(192), 2, + anon_sym_COMMA, + anon_sym_RBRACK, + [1520] = 5, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(136), 1, + anon_sym_PLUS, STATE(60), 1, sym_comment, - [1551] = 6, + ACTIONS(194), 2, + ts_builtin_sym_end, + sym_identifier, + [1537] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(193), 1, + ACTIONS(196), 1, anon_sym_COMMA, - ACTIONS(195), 1, - anon_sym_RBRACE, - STATE(48), 1, - aux_sym__old_module_repeat1, + ACTIONS(198), 1, + anon_sym_RBRACK, + STATE(43), 1, + aux_sym_list_expression_repeat1, STATE(61), 1, sym_comment, - [1570] = 5, + [1556] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(132), 1, - anon_sym_PLUS, + ACTIONS(200), 1, + anon_sym_COMMA, + ACTIONS(202), 1, + anon_sym_RBRACE, + STATE(50), 1, + aux_sym__old_module_repeat1, STATE(62), 1, sym_comment, - ACTIONS(197), 2, - anon_sym_COMMA, - anon_sym_RBRACE, - [1587] = 6, + [1575] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(144), 1, - sym_identifier, - ACTIONS(199), 1, - anon_sym_RBRACE, + ACTIONS(136), 1, + anon_sym_PLUS, STATE(63), 1, sym_comment, - STATE(76), 1, - sym__colon_property, - [1606] = 5, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(201), 1, + ACTIONS(204), 2, anon_sym_COMMA, - ACTIONS(204), 1, anon_sym_RBRACE, - STATE(64), 2, - sym_comment, - aux_sym__old_module_repeat1, - [1623] = 5, + [1592] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(132), 1, - anon_sym_PLUS, - STATE(65), 1, - sym_comment, - ACTIONS(206), 2, + ACTIONS(206), 1, anon_sym_COMMA, - anon_sym_RPAREN, - [1640] = 6, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(160), 1, - sym_identifier, ACTIONS(208), 1, anon_sym_RPAREN, - STATE(66), 1, + STATE(53), 1, + aux_sym__new_module_repeat1, + STATE(64), 1, sym_comment, - STATE(78), 1, - sym__equal_property, - [1659] = 5, + [1611] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5488,61 +5443,80 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_COMMA, ACTIONS(213), 1, anon_sym_RPAREN, - STATE(67), 2, + STATE(65), 2, sym_comment, aux_sym__new_module_repeat1, - [1676] = 5, + [1628] = 6, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, + ACTIONS(145), 1, + sym_identifier, ACTIONS(215), 1, - anon_sym_COMMA, - ACTIONS(218), 1, + anon_sym_RBRACE, + STATE(66), 1, + sym_comment, + STATE(91), 1, + sym__colon_property, + [1647] = 6, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(172), 1, + sym_identifier, + ACTIONS(217), 1, anon_sym_RPAREN, + STATE(67), 1, + sym_comment, + STATE(74), 1, + sym__equal_property, + [1666] = 5, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(219), 1, + anon_sym_COMMA, + ACTIONS(222), 1, + anon_sym_RBRACE, STATE(68), 2, sym_comment, - aux_sym_select_value_repeat1, - [1693] = 6, + aux_sym__old_module_repeat1, + [1683] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(144), 1, - sym_identifier, - ACTIONS(220), 1, - anon_sym_RBRACE, + ACTIONS(136), 1, + anon_sym_PLUS, STATE(69), 1, sym_comment, - STATE(76), 1, - sym__colon_property, - [1712] = 6, + ACTIONS(224), 2, + anon_sym_COMMA, + anon_sym_RPAREN, + [1700] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(222), 1, - anon_sym_COMMA, - ACTIONS(224), 1, - anon_sym_RPAREN, - STATE(51), 1, - aux_sym__new_module_repeat1, STATE(70), 1, sym_comment, - [1731] = 6, + ACTIONS(226), 2, + ts_builtin_sym_end, + sym_identifier, + [1714] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(226), 1, - anon_sym_COMMA, - ACTIONS(228), 1, - anon_sym_RBRACE, - STATE(54), 1, - aux_sym__old_module_repeat1, STATE(71), 1, sym_comment, - [1750] = 4, + ACTIONS(228), 2, + ts_builtin_sym_end, + sym_identifier, + [1728] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5552,7 +5526,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(230), 2, ts_builtin_sym_end, sym_identifier, - [1764] = 4, + [1742] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5562,7 +5536,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(232), 2, ts_builtin_sym_end, sym_identifier, - [1778] = 4, + [1756] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5570,9 +5544,9 @@ static const uint16_t ts_small_parse_table[] = { STATE(74), 1, sym_comment, ACTIONS(234), 2, - ts_builtin_sym_end, - sym_identifier, - [1792] = 4, + anon_sym_COMMA, + anon_sym_RPAREN, + [1770] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5582,27 +5556,29 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(236), 2, ts_builtin_sym_end, sym_identifier, - [1806] = 4, + [1784] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, + ACTIONS(136), 1, + anon_sym_PLUS, + ACTIONS(238), 1, + anon_sym_COMMA, STATE(76), 1, sym_comment, - ACTIONS(238), 2, - anon_sym_COMMA, - anon_sym_RBRACE, - [1820] = 4, + [1800] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, + ACTIONS(240), 1, + sym_identifier, STATE(77), 1, sym_comment, - ACTIONS(240), 2, - ts_builtin_sym_end, - sym_identifier, - [1834] = 4, + STATE(93), 1, + sym_select_value, + [1816] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5610,9 +5586,9 @@ static const uint16_t ts_small_parse_table[] = { STATE(78), 1, sym_comment, ACTIONS(242), 2, - anon_sym_COMMA, - anon_sym_RPAREN, - [1848] = 5, + ts_builtin_sym_end, + sym_identifier, + [1830] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5621,20 +5597,19 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LBRACE, STATE(79), 1, sym_comment, - STATE(105), 1, + STATE(103), 1, sym_select_cases, - [1864] = 5, + [1846] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(132), 1, - anon_sym_PLUS, - ACTIONS(246), 1, - anon_sym_COMMA, STATE(80), 1, sym_comment, - [1880] = 4, + ACTIONS(246), 2, + ts_builtin_sym_end, + sym_identifier, + [1860] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5644,7 +5619,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(248), 2, ts_builtin_sym_end, sym_identifier, - [1894] = 4, + [1874] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5654,147 +5629,144 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(250), 2, ts_builtin_sym_end, sym_identifier, - [1908] = 4, + [1888] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(83), 1, sym_comment, - ACTIONS(252), 2, - ts_builtin_sym_end, - sym_identifier, - [1922] = 4, + ACTIONS(158), 2, + anon_sym_COMMA, + anon_sym_RPAREN, + [1902] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(84), 1, sym_comment, - ACTIONS(254), 2, + ACTIONS(252), 2, ts_builtin_sym_end, sym_identifier, - [1936] = 4, + [1916] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(85), 1, sym_comment, + ACTIONS(254), 2, + ts_builtin_sym_end, + sym_identifier, + [1930] = 5, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + ACTIONS(145), 1, + sym_identifier, + STATE(86), 1, + sym_comment, + STATE(91), 1, + sym__colon_property, + [1946] = 4, + ACTIONS(3), 1, + anon_sym_SLASH_SLASH, + ACTIONS(5), 1, + anon_sym_SLASH_STAR, + STATE(87), 1, + sym_comment, ACTIONS(256), 2, ts_builtin_sym_end, sym_identifier, - [1950] = 5, + [1960] = 5, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(144), 1, + ACTIONS(172), 1, sym_identifier, - STATE(76), 1, - sym__colon_property, - STATE(86), 1, - sym_comment, - [1966] = 5, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(258), 1, - sym_identifier, - STATE(87), 1, - sym_comment, - STATE(103), 1, - sym_select_value, - [1982] = 5, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(160), 1, - sym_identifier, - STATE(78), 1, + STATE(74), 1, sym__equal_property, STATE(88), 1, sym_comment, - [1998] = 4, + [1976] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(89), 1, sym_comment, - ACTIONS(232), 2, + ACTIONS(248), 2, ts_builtin_sym_end, sym_identifier, - [2012] = 4, + [1990] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(90), 1, sym_comment, - ACTIONS(260), 2, + ACTIONS(258), 2, ts_builtin_sym_end, sym_identifier, - [2026] = 4, + [2004] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, STATE(91), 1, sym_comment, - ACTIONS(262), 2, - ts_builtin_sym_end, - sym_identifier, - [2040] = 4, + ACTIONS(260), 2, + anon_sym_COMMA, + anon_sym_RBRACE, + [2018] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, + ACTIONS(262), 1, + anon_sym_LPAREN, STATE(92), 1, sym_comment, - ACTIONS(218), 2, - anon_sym_COMMA, - anon_sym_RPAREN, - [2054] = 4, + [2031] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, + ACTIONS(264), 1, + anon_sym_COMMA, STATE(93), 1, sym_comment, - ACTIONS(264), 2, - ts_builtin_sym_end, - sym_identifier, - [2068] = 4, + [2044] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(266), 1, - anon_sym_COMMA, + anon_sym_SLASH, STATE(94), 1, sym_comment, - [2081] = 4, + [2057] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(268), 1, - anon_sym_SLASH, + anon_sym_COMMA, STATE(95), 1, sym_comment, - [2094] = 4, + [2070] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(270), 1, - aux_sym_integer_literal_token1, + anon_sym_COLON, STATE(96), 1, sym_comment, - [2107] = 4, + [2083] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5803,16 +5775,16 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_COMMA, STATE(97), 1, sym_comment, - [2120] = 4, - ACTIONS(3), 1, + [2096] = 4, + ACTIONS(112), 1, anon_sym_SLASH_SLASH, - ACTIONS(5), 1, + ACTIONS(114), 1, anon_sym_SLASH_STAR, ACTIONS(274), 1, - anon_sym_COMMA, + aux_sym_comment_token1, STATE(98), 1, sym_comment, - [2133] = 4, + [2109] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5821,7 +5793,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_RPAREN, STATE(99), 1, sym_comment, - [2146] = 4, + [2122] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5830,7 +5802,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_COLON, STATE(100), 1, sym_comment, - [2159] = 4, + [2135] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5839,25 +5811,25 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_COMMA, STATE(101), 1, sym_comment, - [2172] = 4, + [2148] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(282), 1, - anon_sym_COLON, + anon_sym_COMMA, STATE(102), 1, sym_comment, - [2185] = 4, + [2161] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(284), 1, - anon_sym_COMMA, + anon_sym_RPAREN, STATE(103), 1, sym_comment, - [2198] = 4, + [2174] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, @@ -5866,101 +5838,74 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LPAREN, STATE(104), 1, sym_comment, - [2211] = 4, + [2187] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(288), 1, - anon_sym_RPAREN, + anon_sym_COMMA, STATE(105), 1, sym_comment, - [2224] = 4, + [2200] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(290), 1, - anon_sym_COMMA, + anon_sym_EQ, STATE(106), 1, sym_comment, - [2237] = 4, + [2213] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(292), 1, - anon_sym_EQ, + aux_sym_integer_literal_token1, STATE(107), 1, sym_comment, - [2250] = 4, + [2226] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(294), 1, - anon_sym_LPAREN, + ts_builtin_sym_end, STATE(108), 1, sym_comment, - [2263] = 4, - ACTIONS(110), 1, + [2239] = 4, + ACTIONS(3), 1, anon_sym_SLASH_SLASH, - ACTIONS(112), 1, + ACTIONS(5), 1, anon_sym_SLASH_STAR, ACTIONS(296), 1, - aux_sym_comment_token1, + anon_sym_RPAREN, STATE(109), 1, sym_comment, - [2276] = 4, - ACTIONS(3), 1, + [2252] = 4, + ACTIONS(112), 1, anon_sym_SLASH_SLASH, - ACTIONS(5), 1, + ACTIONS(114), 1, anon_sym_SLASH_STAR, ACTIONS(298), 1, - anon_sym_RPAREN, + aux_sym_comment_token2, STATE(110), 1, sym_comment, - [2289] = 4, + [2265] = 4, ACTIONS(3), 1, anon_sym_SLASH_SLASH, ACTIONS(5), 1, anon_sym_SLASH_STAR, - ACTIONS(300), 1, - ts_builtin_sym_end, + ACTIONS(238), 1, + anon_sym_COMMA, STATE(111), 1, sym_comment, - [2302] = 4, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(302), 1, - anon_sym_COMMA, - STATE(112), 1, - sym_comment, - [2315] = 4, - ACTIONS(110), 1, - anon_sym_SLASH_SLASH, - ACTIONS(112), 1, - anon_sym_SLASH_STAR, - ACTIONS(304), 1, - aux_sym_comment_token2, - STATE(113), 1, - sym_comment, - [2328] = 4, - ACTIONS(3), 1, - anon_sym_SLASH_SLASH, - ACTIONS(5), 1, - anon_sym_SLASH_STAR, - ACTIONS(246), 1, - anon_sym_COMMA, - STATE(114), 1, - sym_comment, - [2341] = 1, - ACTIONS(306), 1, + [2278] = 1, + ACTIONS(300), 1, ts_builtin_sym_end, - [2345] = 1, - ACTIONS(308), 1, + [2282] = 1, + ACTIONS(302), 1, ts_builtin_sym_end, }; @@ -6001,238 +5946,232 @@ static const uint32_t ts_small_parse_table_map[] = { [SMALL_STATE(35)] = 1034, [SMALL_STATE(36)] = 1052, [SMALL_STATE(37)] = 1077, - [SMALL_STATE(38)] = 1102, - [SMALL_STATE(39)] = 1127, - [SMALL_STATE(40)] = 1149, - [SMALL_STATE(41)] = 1171, - [SMALL_STATE(42)] = 1193, - [SMALL_STATE(43)] = 1213, - [SMALL_STATE(44)] = 1235, - [SMALL_STATE(45)] = 1255, - [SMALL_STATE(46)] = 1274, - [SMALL_STATE(47)] = 1293, - [SMALL_STATE(48)] = 1312, - [SMALL_STATE(49)] = 1331, - [SMALL_STATE(50)] = 1348, - [SMALL_STATE(51)] = 1367, - [SMALL_STATE(52)] = 1386, - [SMALL_STATE(53)] = 1405, - [SMALL_STATE(54)] = 1424, - [SMALL_STATE(55)] = 1443, - [SMALL_STATE(56)] = 1462, - [SMALL_STATE(57)] = 1479, - [SMALL_STATE(58)] = 1496, - [SMALL_STATE(59)] = 1513, - [SMALL_STATE(60)] = 1532, - [SMALL_STATE(61)] = 1551, - [SMALL_STATE(62)] = 1570, - [SMALL_STATE(63)] = 1587, - [SMALL_STATE(64)] = 1606, - [SMALL_STATE(65)] = 1623, - [SMALL_STATE(66)] = 1640, - [SMALL_STATE(67)] = 1659, - [SMALL_STATE(68)] = 1676, - [SMALL_STATE(69)] = 1693, - [SMALL_STATE(70)] = 1712, - [SMALL_STATE(71)] = 1731, - [SMALL_STATE(72)] = 1750, - [SMALL_STATE(73)] = 1764, - [SMALL_STATE(74)] = 1778, - [SMALL_STATE(75)] = 1792, - [SMALL_STATE(76)] = 1806, - [SMALL_STATE(77)] = 1820, - [SMALL_STATE(78)] = 1834, - [SMALL_STATE(79)] = 1848, - [SMALL_STATE(80)] = 1864, - [SMALL_STATE(81)] = 1880, - [SMALL_STATE(82)] = 1894, - [SMALL_STATE(83)] = 1908, - [SMALL_STATE(84)] = 1922, - [SMALL_STATE(85)] = 1936, - [SMALL_STATE(86)] = 1950, - [SMALL_STATE(87)] = 1966, - [SMALL_STATE(88)] = 1982, - [SMALL_STATE(89)] = 1998, - [SMALL_STATE(90)] = 2012, - [SMALL_STATE(91)] = 2026, - [SMALL_STATE(92)] = 2040, - [SMALL_STATE(93)] = 2054, - [SMALL_STATE(94)] = 2068, - [SMALL_STATE(95)] = 2081, - [SMALL_STATE(96)] = 2094, - [SMALL_STATE(97)] = 2107, - [SMALL_STATE(98)] = 2120, - [SMALL_STATE(99)] = 2133, - [SMALL_STATE(100)] = 2146, - [SMALL_STATE(101)] = 2159, - [SMALL_STATE(102)] = 2172, - [SMALL_STATE(103)] = 2185, - [SMALL_STATE(104)] = 2198, - [SMALL_STATE(105)] = 2211, - [SMALL_STATE(106)] = 2224, - [SMALL_STATE(107)] = 2237, - [SMALL_STATE(108)] = 2250, - [SMALL_STATE(109)] = 2263, - [SMALL_STATE(110)] = 2276, - [SMALL_STATE(111)] = 2289, - [SMALL_STATE(112)] = 2302, - [SMALL_STATE(113)] = 2315, - [SMALL_STATE(114)] = 2328, - [SMALL_STATE(115)] = 2341, - [SMALL_STATE(116)] = 2345, + [SMALL_STATE(38)] = 1097, + [SMALL_STATE(39)] = 1119, + [SMALL_STATE(40)] = 1141, + [SMALL_STATE(41)] = 1161, + [SMALL_STATE(42)] = 1183, + [SMALL_STATE(43)] = 1205, + [SMALL_STATE(44)] = 1222, + [SMALL_STATE(45)] = 1241, + [SMALL_STATE(46)] = 1260, + [SMALL_STATE(47)] = 1277, + [SMALL_STATE(48)] = 1294, + [SMALL_STATE(49)] = 1313, + [SMALL_STATE(50)] = 1332, + [SMALL_STATE(51)] = 1351, + [SMALL_STATE(52)] = 1370, + [SMALL_STATE(53)] = 1389, + [SMALL_STATE(54)] = 1408, + [SMALL_STATE(55)] = 1427, + [SMALL_STATE(56)] = 1446, + [SMALL_STATE(57)] = 1465, + [SMALL_STATE(58)] = 1484, + [SMALL_STATE(59)] = 1503, + [SMALL_STATE(60)] = 1520, + [SMALL_STATE(61)] = 1537, + [SMALL_STATE(62)] = 1556, + [SMALL_STATE(63)] = 1575, + [SMALL_STATE(64)] = 1592, + [SMALL_STATE(65)] = 1611, + [SMALL_STATE(66)] = 1628, + [SMALL_STATE(67)] = 1647, + [SMALL_STATE(68)] = 1666, + [SMALL_STATE(69)] = 1683, + [SMALL_STATE(70)] = 1700, + [SMALL_STATE(71)] = 1714, + [SMALL_STATE(72)] = 1728, + [SMALL_STATE(73)] = 1742, + [SMALL_STATE(74)] = 1756, + [SMALL_STATE(75)] = 1770, + [SMALL_STATE(76)] = 1784, + [SMALL_STATE(77)] = 1800, + [SMALL_STATE(78)] = 1816, + [SMALL_STATE(79)] = 1830, + [SMALL_STATE(80)] = 1846, + [SMALL_STATE(81)] = 1860, + [SMALL_STATE(82)] = 1874, + [SMALL_STATE(83)] = 1888, + [SMALL_STATE(84)] = 1902, + [SMALL_STATE(85)] = 1916, + [SMALL_STATE(86)] = 1930, + [SMALL_STATE(87)] = 1946, + [SMALL_STATE(88)] = 1960, + [SMALL_STATE(89)] = 1976, + [SMALL_STATE(90)] = 1990, + [SMALL_STATE(91)] = 2004, + [SMALL_STATE(92)] = 2018, + [SMALL_STATE(93)] = 2031, + [SMALL_STATE(94)] = 2044, + [SMALL_STATE(95)] = 2057, + [SMALL_STATE(96)] = 2070, + [SMALL_STATE(97)] = 2083, + [SMALL_STATE(98)] = 2096, + [SMALL_STATE(99)] = 2109, + [SMALL_STATE(100)] = 2122, + [SMALL_STATE(101)] = 2135, + [SMALL_STATE(102)] = 2148, + [SMALL_STATE(103)] = 2161, + [SMALL_STATE(104)] = 2174, + [SMALL_STATE(105)] = 2187, + [SMALL_STATE(106)] = 2200, + [SMALL_STATE(107)] = 2213, + [SMALL_STATE(108)] = 2226, + [SMALL_STATE(109)] = 2239, + [SMALL_STATE(110)] = 2252, + [SMALL_STATE(111)] = 2265, + [SMALL_STATE(112)] = 2278, + [SMALL_STATE(113)] = 2282, }; 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}}, SHIFT(109), - [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(113), + [3] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98), + [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110), [7] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 0), - [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42), - [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53), - [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(21), - [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(19), - [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96), - [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22), - [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18), - [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39), + [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37), + [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58), + [13] = {.entry = {.count = 1, .reusable = false}}, SHIFT(25), + [15] = {.entry = {.count = 1, .reusable = false}}, SHIFT(14), + [17] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107), + [19] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23), + [21] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19), + [23] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38), [25] = {.entry = {.count = 1, .reusable = false}}, SHIFT(104), - [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(114), - [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3), - [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32), - [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24), - [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25), + [27] = {.entry = {.count = 1, .reusable = false}}, SHIFT(111), + [29] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5), + [31] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28), + [33] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22), + [35] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24), [37] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), - [39] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(19), - [42] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(18), - [45] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(39), + [39] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(14), + [42] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(19), + [45] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(38), [48] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_cases_repeat1, 2), SHIFT_REPEAT(100), - [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99), - [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19), + [51] = {.entry = {.count = 1, .reusable = true}}, SHIFT(109), + [53] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14), [55] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100), - [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(110), - [59] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpreted_string_literal, 2), + [57] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99), + [59] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_literal, 1), [61] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_source_file, 1), [63] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpreted_string_literal, 3), [65] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), - [67] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(42), - [70] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__string_literal, 1), - [72] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_boolean_literal, 1), - [74] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_expression, 6), - [76] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expr, 1), - [78] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer_literal, 1), - [80] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 4, .production_id = 11), - [82] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 4, .production_id = 6), - [84] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 5, .production_id = 12), - [86] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 3, .production_id = 5), - [88] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 4, .production_id = 12), - [90] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer_literal, 2), + [67] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 2), SHIFT_REPEAT(37), + [70] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_interpreted_string_literal, 2), + [72] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__string_literal, 1), + [74] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_expression, 3, .production_id = 7), + [76] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 3, .production_id = 5), + [78] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 4, .production_id = 6), + [80] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer_literal, 1), + [82] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 2), + [84] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__expr, 1), + [86] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 4, .production_id = 11), + [88] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 4, .production_id = 5), + [90] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 5, .production_id = 12), [92] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 3, .production_id = 6), - [94] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_binary_expression, 3, .production_id = 7), + [94] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 4, .production_id = 12), [96] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 5, .production_id = 11), - [98] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_list_expression, 2), + [98] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_expression, 6), [100] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 2), - [102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_expression, 4, .production_id = 5), - [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94), - [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101), - [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(112), - [110] = {.entry = {.count = 1, .reusable = false}}, SHIFT(109), - [112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(113), - [114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(58), - [116] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14), - [118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58), - [120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16), - [122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9), - [124] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46), - [126] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55), - [128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4), - [130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29), - [132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7), - [134] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), SHIFT_REPEAT(58), - [137] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), - [139] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), SHIFT_REPEAT(58), - [142] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75), - [144] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102), - [146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(93), - [148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36), - [150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97), - [152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(63), - [154] = {.entry = {.count = 1, .reusable = true}}, SHIFT(74), - [156] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 2), - [158] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77), - [160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(107), - [162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66), - [164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90), - [166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34), - [168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33), - [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69), - [172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23), - [174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91), - [176] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 13), SHIFT_REPEAT(6), - [179] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 13), - [181] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 6), - [183] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 1), - [185] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 1), - [187] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38), - [189] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5), - [191] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27), - [193] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45), - [195] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84), - [197] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__colon_property, 3, .production_id = 8), - [199] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85), - [201] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 10), SHIFT_REPEAT(86), - [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 10), - [206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__equal_property, 3, .production_id = 8), - [208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72), + [102] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_integer_literal, 2), + [104] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102), + [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10), + [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52), + [110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57), + [112] = {.entry = {.count = 1, .reusable = false}}, SHIFT(98), + [114] = {.entry = {.count = 1, .reusable = false}}, SHIFT(110), + [116] = {.entry = {.count = 1, .reusable = false}}, SHIFT(46), + [118] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18), + [120] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46), + [122] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16), + [124] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), SHIFT_REPEAT(46), + [127] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), + [129] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 2), SHIFT_REPEAT(46), + [132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4), + [134] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29), + [136] = {.entry = {.count = 1, .reusable = true}}, SHIFT(9), + [138] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 13), SHIFT_REPEAT(8), + [141] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 13), + [143] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31), + [145] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96), + [147] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54), + [149] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21), + [151] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 1), + [153] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_interpreted_string_literal_repeat1, 1), + [155] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_value_repeat1, 2), SHIFT_REPEAT(41), + [158] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_select_value_repeat1, 2), + [160] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78), + [162] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41), + [164] = {.entry = {.count = 1, .reusable = true}}, SHIFT(105), + [166] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66), + [168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72), + [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73), + [172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(106), + [174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70), + [176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67), + [178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(75), + [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27), + [182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44), + [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26), + [186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97), + [188] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71), + [190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(33), + [192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_list_expression_repeat1, 2, .production_id = 6), + [194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_assignment, 3, .production_id = 2), + [196] = {.entry = {.count = 1, .reusable = true}}, SHIFT(3), + [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(30), + [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48), + [202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82), + [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__colon_property, 3, .production_id = 8), + [206] = {.entry = {.count = 1, .reusable = true}}, SHIFT(51), + [208] = {.entry = {.count = 1, .reusable = true}}, SHIFT(90), [210] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__new_module_repeat1, 2, .production_id = 10), SHIFT_REPEAT(88), [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__new_module_repeat1, 2, .production_id = 10), - [215] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_select_value_repeat1, 2), SHIFT_REPEAT(40), - [218] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_select_value_repeat1, 2), - [220] = {.entry = {.count = 1, .reusable = true}}, SHIFT(31), - [222] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50), - [224] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83), - [226] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52), - [228] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26), - [230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 6, .production_id = 9), - [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1, .production_id = 1), - [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 5, .production_id = 9), - [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 5, .production_id = 4), - [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 5), - [240] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 5, .production_id = 4), - [242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__new_module_repeat1, 2, .production_id = 5), - [244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12), - [246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__case_value, 1), - [248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 1), - [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__definition, 1), - [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 4, .production_id = 4), - [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 4, .production_id = 4), - [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 6, .production_id = 9), - [258] = {.entry = {.count = 1, .reusable = true}}, SHIFT(108), - [260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 5, .production_id = 9), - [262] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 3, .production_id = 3), - [264] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 3, .production_id = 3), - [266] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 5, .production_id = 16), - [268] = {.entry = {.count = 1, .reusable = false}}, SHIFT(116), - [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(28), + [215] = {.entry = {.count = 1, .reusable = true}}, SHIFT(85), + [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87), + [219] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 10), SHIFT_REPEAT(86), + [222] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 10), + [224] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__equal_property, 3, .production_id = 8), + [226] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 3, .production_id = 3), + [228] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 3, .production_id = 3), + [230] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 5, .production_id = 9), + [232] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 5, .production_id = 4), + [234] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__new_module_repeat1, 2, .production_id = 5), + [236] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 5, .production_id = 9), + [238] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__case_value, 1), + [240] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92), + [242] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 5, .production_id = 4), + [244] = {.entry = {.count = 1, .reusable = true}}, SHIFT(13), + [246] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_source_file_repeat1, 1), + [248] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_module, 1, .production_id = 1), + [250] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 4, .production_id = 4), + [252] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__definition, 1), + [254] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__old_module, 6, .production_id = 9), + [256] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 6, .production_id = 9), + [258] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__new_module, 4, .production_id = 4), + [260] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym__old_module_repeat1, 2, .production_id = 5), + [262] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36), + [264] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79), + [266] = {.entry = {.count = 1, .reusable = false}}, SHIFT(112), + [268] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_case, 3, .production_id = 17), + [270] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7), [272] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 4, .production_id = 15), - [274] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_case, 3, .production_id = 18), + [274] = {.entry = {.count = 1, .reusable = false}}, SHIFT(113), [276] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_cases, 2), [278] = {.entry = {.count = 1, .reusable = true}}, SHIFT(2), - [280] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 3, .production_id = 14), - [282] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8), - [284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79), - [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87), - [288] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20), - [290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35), - [292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(10), - [294] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37), - [296] = {.entry = {.count = 1, .reusable = false}}, SHIFT(115), - [298] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_cases, 3), - [300] = {.entry = {.count = 1, .reusable = true}}, ACCEPT_INPUT(), - [302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 6, .production_id = 17), - [304] = {.entry = {.count = 1, .reusable = false}}, SHIFT(95), - [306] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2), - [308] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 3), + [280] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35), + [282] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 3, .production_id = 14), + [284] = {.entry = {.count = 1, .reusable = true}}, SHIFT(32), + [286] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77), + [288] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_value, 5, .production_id = 16), + [290] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6), + [292] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34), + [294] = {.entry = {.count = 1, .reusable = true}}, ACCEPT_INPUT(), + [296] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_select_cases, 3), + [298] = {.entry = {.count = 1, .reusable = false}}, SHIFT(94), + [300] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 3), + [302] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_comment, 2), }; #ifdef __cplusplus diff --git a/test/corpus/select.txt b/test/corpus/select.txt index df720d5..fc4bf04 100644 --- a/test/corpus/select.txt +++ b/test/corpus/select.txt @@ -226,6 +226,34 @@ foo = select(release_variable("ONE", "TWO"), { (default) (interpreted_string_literal)))))) +================================================================================ +Select (trailing comma in arguments) +================================================================================ + +foo = select(some_boolean("VALUE",), { + true: "true", + false: "false", +}) + +-------------------------------------------------------------------------------- + +(source_file + (assignment + (identifier) + (operator) + (select_expression + (select_value + (identifier) + (interpreted_string_literal) + (ERROR)) + (select_cases + (select_case + (boolean_literal) + (interpreted_string_literal)) + (select_case + (boolean_literal) + (interpreted_string_literal)))))) + ================================================================================ Select (boolean typed) ================================================================================