diff --git a/grammar.js b/grammar.js index 738cce2..c694209 100644 --- a/grammar.js +++ b/grammar.js @@ -31,7 +31,7 @@ module.exports = grammar({ ], reserved: { - global: [ + global: $ => [ 'const', 'do', 'else', @@ -45,7 +45,7 @@ module.exports = grammar({ 'var', 'while', ], - properties: [], + properties: $ => [], }, supertypes: $ => [ @@ -1217,7 +1217,7 @@ module.exports = grammar({ field('value', choice($.pattern, $.assignment_pattern)), ), - _property_name: $ => reserved([], choice( + _property_name: $ => reserved('properties', choice( alias(choice( $.identifier, $._reserved_identifier diff --git a/src/grammar.json b/src/grammar.json index d96828b..4ac9d2b 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -3591,7 +3591,7 @@ "named": true, "value": "property_identifier" }, - "words": [] + "context_name": "properties" } ] } @@ -6556,7 +6556,7 @@ } ] }, - "words": [] + "context_name": "properties" }, "computed_property_name": { "type": "SEQ", @@ -6936,54 +6936,57 @@ "primary_expression", "pattern" ], - "reserved": [ - { - "type": "STRING", - "value": "const" - }, - { - "type": "STRING", - "value": "do" - }, - { - "type": "STRING", - "value": "else" - }, - { - "type": "STRING", - "value": "finally" - }, - { - "type": "STRING", - "value": "for" - }, - { - "type": "STRING", - "value": "function" - }, - { - "type": "STRING", - "value": "if" - }, - { - "type": "STRING", - "value": "let" - }, - { - "type": "STRING", - "value": "return" - }, - { - "type": "STRING", - "value": "throw" - }, - { - "type": "STRING", - "value": "var" - }, - { - "type": "STRING", - "value": "while" - } - ] + "reserved": { + "global": [ + { + "type": "STRING", + "value": "const" + }, + { + "type": "STRING", + "value": "do" + }, + { + "type": "STRING", + "value": "else" + }, + { + "type": "STRING", + "value": "finally" + }, + { + "type": "STRING", + "value": "for" + }, + { + "type": "STRING", + "value": "function" + }, + { + "type": "STRING", + "value": "if" + }, + { + "type": "STRING", + "value": "let" + }, + { + "type": "STRING", + "value": "return" + }, + { + "type": "STRING", + "value": "throw" + }, + { + "type": "STRING", + "value": "var" + }, + { + "type": "STRING", + "value": "while" + } + ], + "properties": [] + } } diff --git a/src/parser.c b/src/parser.c index ce8a675..8896d81 100644 --- a/src/parser.c +++ b/src/parser.c @@ -6572,11 +6572,11 @@ static bool ts_lex_keywords(TSLexer *lexer, TSStateId state) { static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [0] = {.lex_state = 0, .external_lex_state = 1}, [1] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, - [2] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 2}, - [3] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 2}, - [4] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 2}, - [5] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 2}, - [6] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 2}, + [2] = {.lex_state = 4, .external_lex_state = 2}, + [3] = {.lex_state = 4, .external_lex_state = 2}, + [4] = {.lex_state = 4, .external_lex_state = 2}, + [5] = {.lex_state = 4, .external_lex_state = 2}, + [6] = {.lex_state = 4, .external_lex_state = 2}, [7] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 2}, [8] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [9] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, @@ -6631,21 +6631,21 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [58] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 3}, [59] = {.lex_state = 124, .external_lex_state = 3, .reserved_word_set_id = 3}, [60] = {.lex_state = 124, .external_lex_state = 3, .reserved_word_set_id = 3}, - [61] = {.lex_state = 124, .external_lex_state = 4}, - [62] = {.lex_state = 124, .external_lex_state = 4}, - [63] = {.lex_state = 124, .external_lex_state = 4}, - [64] = {.lex_state = 124, .external_lex_state = 4}, - [65] = {.lex_state = 124, .external_lex_state = 4}, - [66] = {.lex_state = 124, .external_lex_state = 4}, - [67] = {.lex_state = 124, .external_lex_state = 4}, - [68] = {.lex_state = 124, .external_lex_state = 4}, - [69] = {.lex_state = 124, .external_lex_state = 4}, - [70] = {.lex_state = 124, .external_lex_state = 4}, - [71] = {.lex_state = 124, .external_lex_state = 4}, - [72] = {.lex_state = 124, .external_lex_state = 4}, - [73] = {.lex_state = 124, .external_lex_state = 4}, - [74] = {.lex_state = 124, .external_lex_state = 4}, - [75] = {.lex_state = 124, .external_lex_state = 4}, + [61] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [62] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [63] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [64] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [65] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [66] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [67] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [68] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [69] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [70] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [71] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [72] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [73] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [74] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, + [75] = {.lex_state = 124, .external_lex_state = 4, .reserved_word_set_id = 4}, [76] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [77] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [78] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, @@ -6653,12 +6653,12 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [80] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [81] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [82] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, - [83] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, - [84] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, - [85] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, - [86] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, - [87] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, - [88] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [83] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [84] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [85] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [86] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [87] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [88] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, [89] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [90] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [91] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, @@ -6868,10 +6868,10 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [295] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [296] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, [297] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 3}, - [298] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 3}, + [298] = {.lex_state = 6, .external_lex_state = 4}, [299] = {.lex_state = 6, .external_lex_state = 4}, - [300] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 3}, - [301] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 3}, + [300] = {.lex_state = 6, .external_lex_state = 4}, + [301] = {.lex_state = 6, .external_lex_state = 4}, [302] = {.lex_state = 6, .external_lex_state = 4}, [303] = {.lex_state = 6, .external_lex_state = 4}, [304] = {.lex_state = 6, .external_lex_state = 4}, @@ -6905,97 +6905,97 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [332] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 3}, [333] = {.lex_state = 125, .external_lex_state = 2}, [334] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 3}, - [335] = {.lex_state = 125, .external_lex_state = 5}, - [336] = {.lex_state = 125, .external_lex_state = 5}, - [337] = {.lex_state = 125, .external_lex_state = 5}, - [338] = {.lex_state = 125, .external_lex_state = 5}, - [339] = {.lex_state = 125, .external_lex_state = 2}, - [340] = {.lex_state = 125, .external_lex_state = 5}, - [341] = {.lex_state = 125, .external_lex_state = 5}, + [335] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [336] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [337] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [338] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [339] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [340] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [341] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, [342] = {.lex_state = 125, .external_lex_state = 2}, [343] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 1}, [344] = {.lex_state = 6, .external_lex_state = 3, .reserved_word_set_id = 1}, - [345] = {.lex_state = 125, .external_lex_state = 2}, + [345] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, [346] = {.lex_state = 125, .external_lex_state = 2}, - [347] = {.lex_state = 125, .external_lex_state = 5}, - [348] = {.lex_state = 125, .external_lex_state = 5}, - [349] = {.lex_state = 125, .external_lex_state = 5}, - [350] = {.lex_state = 125, .external_lex_state = 5}, - [351] = {.lex_state = 125, .external_lex_state = 5}, + [347] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [348] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [349] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [350] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [351] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, [352] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 1}, - [353] = {.lex_state = 125, .external_lex_state = 5}, - [354] = {.lex_state = 125, .external_lex_state = 5}, - [355] = {.lex_state = 125, .external_lex_state = 5}, + [353] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [354] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [355] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, [356] = {.lex_state = 6, .external_lex_state = 3, .reserved_word_set_id = 3}, [357] = {.lex_state = 6, .external_lex_state = 3, .reserved_word_set_id = 1}, - [358] = {.lex_state = 125, .external_lex_state = 5}, - [359] = {.lex_state = 125, .external_lex_state = 5}, - [360] = {.lex_state = 125, .external_lex_state = 2}, - [361] = {.lex_state = 125, .external_lex_state = 2}, - [362] = {.lex_state = 125, .external_lex_state = 2}, - [363] = {.lex_state = 125, .external_lex_state = 2}, - [364] = {.lex_state = 125, .external_lex_state = 2}, - [365] = {.lex_state = 125, .external_lex_state = 2}, - [366] = {.lex_state = 125, .external_lex_state = 2}, - [367] = {.lex_state = 125, .external_lex_state = 2}, - [368] = {.lex_state = 125, .external_lex_state = 2}, - [369] = {.lex_state = 125, .external_lex_state = 2}, - [370] = {.lex_state = 125, .external_lex_state = 2}, - [371] = {.lex_state = 125, .external_lex_state = 2}, - [372] = {.lex_state = 125, .external_lex_state = 2}, - [373] = {.lex_state = 125, .external_lex_state = 2}, - [374] = {.lex_state = 125, .external_lex_state = 2}, - [375] = {.lex_state = 125, .external_lex_state = 2}, - [376] = {.lex_state = 125, .external_lex_state = 2}, - [377] = {.lex_state = 125, .external_lex_state = 2}, - [378] = {.lex_state = 125, .external_lex_state = 2}, - [379] = {.lex_state = 125, .external_lex_state = 2}, - [380] = {.lex_state = 125, .external_lex_state = 2}, - [381] = {.lex_state = 125, .external_lex_state = 2}, - [382] = {.lex_state = 125, .external_lex_state = 2}, - [383] = {.lex_state = 125, .external_lex_state = 2}, - [384] = {.lex_state = 125, .external_lex_state = 2}, - [385] = {.lex_state = 125, .external_lex_state = 2}, - [386] = {.lex_state = 125, .external_lex_state = 2}, - [387] = {.lex_state = 125, .external_lex_state = 2}, - [388] = {.lex_state = 125, .external_lex_state = 2}, - [389] = {.lex_state = 125, .external_lex_state = 2}, - [390] = {.lex_state = 125, .external_lex_state = 2}, - [391] = {.lex_state = 125, .external_lex_state = 2}, - [392] = {.lex_state = 125, .external_lex_state = 2}, - [393] = {.lex_state = 125, .external_lex_state = 2}, - [394] = {.lex_state = 125, .external_lex_state = 2}, - [395] = {.lex_state = 125, .external_lex_state = 2}, - [396] = {.lex_state = 125, .external_lex_state = 2}, - [397] = {.lex_state = 125, .external_lex_state = 2}, - [398] = {.lex_state = 125, .external_lex_state = 2}, - [399] = {.lex_state = 125, .external_lex_state = 2}, - [400] = {.lex_state = 125, .external_lex_state = 2}, - [401] = {.lex_state = 125, .external_lex_state = 2}, - [402] = {.lex_state = 125, .external_lex_state = 2}, - [403] = {.lex_state = 125, .external_lex_state = 2}, - [404] = {.lex_state = 125, .external_lex_state = 2}, - [405] = {.lex_state = 125, .external_lex_state = 2}, - [406] = {.lex_state = 125, .external_lex_state = 2}, - [407] = {.lex_state = 125, .external_lex_state = 2}, - [408] = {.lex_state = 125, .external_lex_state = 2}, - [409] = {.lex_state = 125, .external_lex_state = 2}, + [358] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [359] = {.lex_state = 125, .external_lex_state = 5, .reserved_word_set_id = 4}, + [360] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [361] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [362] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [363] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [364] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [365] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [366] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [367] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [368] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [369] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [370] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [371] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [372] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [373] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [374] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [375] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [376] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [377] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [378] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [379] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [380] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [381] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [382] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [383] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [384] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [385] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [386] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [387] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [388] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [389] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [390] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [391] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [392] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [393] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [394] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [395] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [396] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [397] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [398] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [399] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [400] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [401] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [402] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [403] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [404] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [405] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [406] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [407] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [408] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [409] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, [410] = {.lex_state = 6, .external_lex_state = 3, .reserved_word_set_id = 1}, - [411] = {.lex_state = 125, .external_lex_state = 2}, - [412] = {.lex_state = 125, .external_lex_state = 2}, - [413] = {.lex_state = 125, .external_lex_state = 2}, - [414] = {.lex_state = 125, .external_lex_state = 2}, - [415] = {.lex_state = 125, .external_lex_state = 2}, - [416] = {.lex_state = 125, .external_lex_state = 2}, - [417] = {.lex_state = 125, .external_lex_state = 2}, - [418] = {.lex_state = 125, .external_lex_state = 2}, - [419] = {.lex_state = 125, .external_lex_state = 2}, - [420] = {.lex_state = 125, .external_lex_state = 2}, - [421] = {.lex_state = 125, .external_lex_state = 2}, - [422] = {.lex_state = 125, .external_lex_state = 2}, - [423] = {.lex_state = 125, .external_lex_state = 2}, - [424] = {.lex_state = 125, .external_lex_state = 2}, - [425] = {.lex_state = 125, .external_lex_state = 2}, + [411] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [412] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [413] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [414] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [415] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [416] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [417] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [418] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [419] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [420] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [421] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [422] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [423] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [424] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, + [425] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 4}, [426] = {.lex_state = 6, .external_lex_state = 4, .reserved_word_set_id = 1}, [427] = {.lex_state = 6, .external_lex_state = 3}, [428] = {.lex_state = 6, .external_lex_state = 3}, @@ -7014,11 +7014,11 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [441] = {.lex_state = 6, .external_lex_state = 3}, [442] = {.lex_state = 6, .external_lex_state = 3, .reserved_word_set_id = 1}, [443] = {.lex_state = 6, .external_lex_state = 3}, - [444] = {.lex_state = 125, .external_lex_state = 2}, + [444] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [445] = {.lex_state = 6, .external_lex_state = 4}, [446] = {.lex_state = 6, .external_lex_state = 4}, [447] = {.lex_state = 6, .external_lex_state = 4}, - [448] = {.lex_state = 125, .external_lex_state = 2}, + [448] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [449] = {.lex_state = 6, .external_lex_state = 4}, [450] = {.lex_state = 6, .external_lex_state = 4}, [451] = {.lex_state = 6, .external_lex_state = 4}, @@ -7029,22 +7029,22 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [456] = {.lex_state = 6, .external_lex_state = 4}, [457] = {.lex_state = 6, .external_lex_state = 4}, [458] = {.lex_state = 6, .external_lex_state = 4}, - [459] = {.lex_state = 125, .external_lex_state = 2}, + [459] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [460] = {.lex_state = 6, .external_lex_state = 4}, [461] = {.lex_state = 6, .external_lex_state = 4}, - [462] = {.lex_state = 125, .external_lex_state = 2}, - [463] = {.lex_state = 125, .external_lex_state = 2}, + [462] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, + [463] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [464] = {.lex_state = 6, .external_lex_state = 3}, - [465] = {.lex_state = 125, .external_lex_state = 2}, + [465] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [466] = {.lex_state = 6, .external_lex_state = 3}, [467] = {.lex_state = 6, .external_lex_state = 3}, [468] = {.lex_state = 6, .external_lex_state = 3}, [469] = {.lex_state = 6, .external_lex_state = 3}, [470] = {.lex_state = 6, .external_lex_state = 4}, [471] = {.lex_state = 6, .external_lex_state = 4}, - [472] = {.lex_state = 125, .external_lex_state = 2}, - [473] = {.lex_state = 125, .external_lex_state = 2}, - [474] = {.lex_state = 125, .external_lex_state = 2}, + [472] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, + [473] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, + [474] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 2}, [475] = {.lex_state = 6, .external_lex_state = 4}, [476] = {.lex_state = 6, .external_lex_state = 4}, [477] = {.lex_state = 6, .external_lex_state = 4}, @@ -7393,13 +7393,13 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [820] = {.lex_state = 124, .external_lex_state = 3}, [821] = {.lex_state = 124, .external_lex_state = 3}, [822] = {.lex_state = 7, .external_lex_state = 3}, - [823] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 5}, - [824] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 5}, + [823] = {.lex_state = 4, .external_lex_state = 2}, + [824] = {.lex_state = 4, .external_lex_state = 2}, [825] = {.lex_state = 124, .external_lex_state = 4}, - [826] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 5}, - [827] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 5}, - [828] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 5}, - [829] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 1}, + [826] = {.lex_state = 4, .external_lex_state = 2}, + [827] = {.lex_state = 4, .external_lex_state = 2}, + [828] = {.lex_state = 4, .external_lex_state = 2}, + [829] = {.lex_state = 4, .external_lex_state = 2}, [830] = {.lex_state = 124, .external_lex_state = 3}, [831] = {.lex_state = 124, .external_lex_state = 4}, [832] = {.lex_state = 124, .external_lex_state = 3}, @@ -7436,21 +7436,21 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [863] = {.lex_state = 124, .external_lex_state = 3}, [864] = {.lex_state = 124, .external_lex_state = 3}, [865] = {.lex_state = 124, .external_lex_state = 3}, - [866] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 1}, + [866] = {.lex_state = 4, .external_lex_state = 2}, [867] = {.lex_state = 124, .external_lex_state = 3}, [868] = {.lex_state = 124, .external_lex_state = 3}, - [869] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 1}, + [869] = {.lex_state = 4, .external_lex_state = 2}, [870] = {.lex_state = 4, .external_lex_state = 2}, [871] = {.lex_state = 4, .external_lex_state = 2}, [872] = {.lex_state = 4, .external_lex_state = 2}, [873] = {.lex_state = 4, .external_lex_state = 2}, [874] = {.lex_state = 4, .external_lex_state = 2}, - [875] = {.lex_state = 4, .external_lex_state = 2, .reserved_word_set_id = 1}, + [875] = {.lex_state = 4, .external_lex_state = 2}, [876] = {.lex_state = 4, .external_lex_state = 2}, - [877] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, - [878] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 5}, + [877] = {.lex_state = 125, .external_lex_state = 2}, + [878] = {.lex_state = 125, .external_lex_state = 2}, [879] = {.lex_state = 4, .external_lex_state = 2}, - [880] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, + [880] = {.lex_state = 125, .external_lex_state = 2}, [881] = {.lex_state = 125, .external_lex_state = 2}, [882] = {.lex_state = 125, .external_lex_state = 2}, [883] = {.lex_state = 125, .external_lex_state = 2}, @@ -7664,7 +7664,7 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1091] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1092] = {.lex_state = 125, .external_lex_state = 5}, [1093] = {.lex_state = 125, .external_lex_state = 2}, - [1094] = {.lex_state = 31, .external_lex_state = 2}, + [1094] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1095] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1096] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1097] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, @@ -7675,7 +7675,7 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1102] = {.lex_state = 125, .external_lex_state = 2}, [1103] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1104] = {.lex_state = 125, .external_lex_state = 2}, - [1105] = {.lex_state = 31, .external_lex_state = 2}, + [1105] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1106] = {.lex_state = 16, .external_lex_state = 7}, [1107] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1108] = {.lex_state = 125, .external_lex_state = 2}, @@ -7689,12 +7689,12 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1116] = {.lex_state = 125, .external_lex_state = 5}, [1117] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1118] = {.lex_state = 125, .external_lex_state = 5}, - [1119] = {.lex_state = 31, .external_lex_state = 2}, + [1119] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1120] = {.lex_state = 125, .external_lex_state = 2}, [1121] = {.lex_state = 125, .external_lex_state = 5}, [1122] = {.lex_state = 16, .external_lex_state = 7}, [1123] = {.lex_state = 16, .external_lex_state = 7}, - [1124] = {.lex_state = 31, .external_lex_state = 2}, + [1124] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1125] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1126] = {.lex_state = 125, .external_lex_state = 5}, [1127] = {.lex_state = 125, .external_lex_state = 5}, @@ -7710,10 +7710,10 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1137] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1138] = {.lex_state = 125, .external_lex_state = 2}, [1139] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, - [1140] = {.lex_state = 31, .external_lex_state = 2}, + [1140] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1141] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1142] = {.lex_state = 125, .external_lex_state = 2}, - [1143] = {.lex_state = 31, .external_lex_state = 2}, + [1143] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1144] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1145] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1146] = {.lex_state = 9, .external_lex_state = 6}, @@ -7732,29 +7732,29 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1159] = {.lex_state = 125, .external_lex_state = 2}, [1160] = {.lex_state = 125, .external_lex_state = 2}, [1161] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, - [1162] = {.lex_state = 31, .external_lex_state = 2}, - [1163] = {.lex_state = 31, .external_lex_state = 2}, + [1162] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1163] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1164] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1165] = {.lex_state = 9, .external_lex_state = 6}, [1166] = {.lex_state = 125, .external_lex_state = 2}, [1167] = {.lex_state = 125, .external_lex_state = 5}, - [1168] = {.lex_state = 31, .external_lex_state = 2}, + [1168] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1169] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1170] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1171] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1172] = {.lex_state = 9, .external_lex_state = 6}, - [1173] = {.lex_state = 31, .external_lex_state = 2}, + [1173] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1174] = {.lex_state = 125, .external_lex_state = 2}, [1175] = {.lex_state = 125, .external_lex_state = 2}, [1176] = {.lex_state = 125, .external_lex_state = 2}, - [1177] = {.lex_state = 31, .external_lex_state = 2}, - [1178] = {.lex_state = 31, .external_lex_state = 2}, + [1177] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1178] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1179] = {.lex_state = 9, .external_lex_state = 6}, - [1180] = {.lex_state = 31, .external_lex_state = 2}, - [1181] = {.lex_state = 31, .external_lex_state = 2}, - [1182] = {.lex_state = 31, .external_lex_state = 2}, - [1183] = {.lex_state = 31, .external_lex_state = 2}, - [1184] = {.lex_state = 31, .external_lex_state = 2}, + [1180] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1181] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1182] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1183] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1184] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1185] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, [1186] = {.lex_state = 9, .external_lex_state = 6}, [1187] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, @@ -7762,13 +7762,13 @@ static const TSLexerMode ts_lex_modes[STATE_COUNT] = { [1189] = {.lex_state = 9, .external_lex_state = 6}, [1190] = {.lex_state = 125, .external_lex_state = 2}, [1191] = {.lex_state = 125, .external_lex_state = 5}, - [1192] = {.lex_state = 31, .external_lex_state = 2}, - [1193] = {.lex_state = 31, .external_lex_state = 2}, + [1192] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, + [1193] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1194] = {.lex_state = 125, .external_lex_state = 5}, [1195] = {.lex_state = 9, .external_lex_state = 6}, [1196] = {.lex_state = 125, .external_lex_state = 5}, [1197] = {.lex_state = 125, .external_lex_state = 2}, - [1198] = {.lex_state = 31, .external_lex_state = 2}, + [1198] = {.lex_state = 31, .external_lex_state = 2, .reserved_word_set_id = 1}, [1199] = {.lex_state = 9, .external_lex_state = 6}, [1200] = {.lex_state = 20, .external_lex_state = 8}, [1201] = {.lex_state = 125, .external_lex_state = 2, .reserved_word_set_id = 1}, @@ -8326,18 +8326,9 @@ static const TSSymbol ts_reserved_words[6][MAX_RESERVED_WORD_SET_SIZE] = { anon_sym_finally, }, [4] = { - anon_sym_else, - anon_sym_if, - anon_sym_for, - anon_sym_while, - anon_sym_do, - anon_sym_return, - anon_sym_throw, anon_sym_finally, }, [5] = { - anon_sym_var, - anon_sym_const, anon_sym_else, anon_sym_if, anon_sym_for, @@ -8346,7 +8337,6 @@ static const TSSymbol ts_reserved_words[6][MAX_RESERVED_WORD_SET_SIZE] = { anon_sym_return, anon_sym_throw, anon_sym_finally, - anon_sym_function, }, }; diff --git a/test/corpus/expressions.txt b/test/corpus/expressions.txt index 6d8f174..7b02085 100644 --- a/test/corpus/expressions.txt +++ b/test/corpus/expressions.txt @@ -193,7 +193,7 @@ Function calls with template strings ============================================ f `hello`; -f +f `hello`; ---