chore: sync generation w/ upstream ts

This commit is contained in:
Amaan Qureshi
2023-11-07 04:49:21 -05:00
committed by Michael Hoffmann
parent 573e5bd076
commit 229d8e50ab
6 changed files with 16534 additions and 16443 deletions

View File

@@ -5,8 +5,17 @@
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "body"
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "body"
},
{
"type": "SYMBOL",
"name": "object"
}
]
},
{
"type": "BLANK"

View File

@@ -202,6 +202,10 @@
{
"type": "body",
"named": true
},
{
"type": "object",
"named": true
}
]
}

File diff suppressed because it is too large Load Diff

View File

@@ -13,9 +13,8 @@ extern "C" {
#define ts_builtin_sym_end 0
#define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
typedef uint16_t TSStateId;
#ifndef TREE_SITTER_API_H_
typedef uint16_t TSStateId;
typedef uint16_t TSSymbol;
typedef uint16_t TSFieldId;
typedef struct TSLanguage TSLanguage;
@@ -140,7 +139,8 @@ struct TSLanguage {
lexer->advance(lexer, skip); \
start: \
skip = false; \
lookahead = lexer->lookahead;
lookahead = lexer->lookahead; \
eof = lexer->eof(lexer);
#define ADVANCE(state_value) \
{ \
@@ -166,7 +166,7 @@ struct TSLanguage {
* Parse Table Macros
*/
#define SMALL_STATE(id) id - LARGE_STATE_COUNT
#define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT)
#define STATE(id) id
@@ -176,7 +176,7 @@ struct TSLanguage {
{{ \
.shift = { \
.type = TSParseActionTypeShift, \
.state = state_value \
.state = (state_value) \
} \
}}
@@ -184,7 +184,7 @@ struct TSLanguage {
{{ \
.shift = { \
.type = TSParseActionTypeShift, \
.state = state_value, \
.state = (state_value), \
.repetition = true \
} \
}}

View File

@@ -1,4 +1,4 @@
#include <tree_sitter/parser.h>
#include "tree_sitter/parser.h"
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic push
@@ -16,7 +16,7 @@
#define MAX_ALIAS_SEQUENCE_LENGTH 10
#define PRODUCTION_ID_COUNT 2
enum {
enum ts_symbol_identifiers {
anon_sym_EQ = 1,
anon_sym_LBRACE = 2,
anon_sym_RBRACE = 3,
@@ -874,7 +874,7 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
},
};
enum {
enum ts_field_identifiers {
field_key = 1,
field_val = 2,
};
@@ -11232,7 +11232,6 @@ static inline bool sym_identifier_character_set_10(int32_t c) {
static bool ts_lex(TSLexer *lexer, TSStateId state) {
START_LEXER();
eof = lexer->eof(lexer);
switch (state) {
case 0:
if (eof) ADVANCE(42);
@@ -11264,9 +11263,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '|') ADVANCE(36);
if (lookahead == '}') ADVANCE(46);
if (lookahead == '~') ADVANCE(108);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
if (('0' <= lookahead && lookahead <= '9')) ADVANCE(63);
END_STATE();
@@ -11298,9 +11295,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '|') ADVANCE(36);
if (lookahead == '}') ADVANCE(46);
if (lookahead == '~') ADVANCE(108);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
if (('1' <= lookahead && lookahead <= '9')) ADVANCE(63);
END_STATE();
@@ -11324,9 +11319,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 'i') ADVANCE(20);
if (lookahead == '|') ADVANCE(36);
if (lookahead == '}') ADVANCE(46);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
END_STATE();
case 3:
@@ -11348,9 +11341,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == 't') ADVANCE(54);
if (lookahead == '{') ADVANCE(45);
if (lookahead == '}') ADVANCE(46);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
if (('1' <= lookahead && lookahead <= '9')) ADVANCE(63);
END_STATE();
@@ -11360,9 +11351,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '=') ADVANCE(43);
if (sym_identifier_character_set_2(lookahead)) ADVANCE(59);
if (lookahead == '{') ADVANCE(45);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
END_STATE();
case 5:
@@ -11512,9 +11501,7 @@ static bool ts_lex(TSLexer *lexer, TSStateId state) {
if (lookahead == '|') ADVANCE(36);
if (lookahead == '}') ADVANCE(46);
if (lookahead == '~') ADVANCE(108);
if (lookahead == '\t' ||
lookahead == '\n' ||
lookahead == '\r' ||
if (('\t' <= lookahead && lookahead <= '\r') ||
lookahead == ' ') ADVANCE(114);
if (('0' <= lookahead && lookahead <= '9')) ADVANCE(80);
END_STATE();
@@ -12482,81 +12469,6 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
[677] = {.lex_state = 0, .external_lex_state = 4},
};
enum {
ts_external_token_quoted_template_start = 0,
ts_external_token_quoted_template_end = 1,
ts_external_token__template_literal_chunk = 2,
ts_external_token_template_interpolation_start = 3,
ts_external_token_template_interpolation_end = 4,
ts_external_token_template_directive_start = 5,
ts_external_token_template_directive_end = 6,
ts_external_token_heredoc_identifier = 7,
};
static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = {
[ts_external_token_quoted_template_start] = sym_quoted_template_start,
[ts_external_token_quoted_template_end] = sym_quoted_template_end,
[ts_external_token__template_literal_chunk] = sym__template_literal_chunk,
[ts_external_token_template_interpolation_start] = sym_template_interpolation_start,
[ts_external_token_template_interpolation_end] = sym_template_interpolation_end,
[ts_external_token_template_directive_start] = sym_template_directive_start,
[ts_external_token_template_directive_end] = sym_template_directive_end,
[ts_external_token_heredoc_identifier] = sym_heredoc_identifier,
};
static const bool ts_external_scanner_states[12][EXTERNAL_TOKEN_COUNT] = {
[1] = {
[ts_external_token_quoted_template_start] = true,
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_interpolation_end] = true,
[ts_external_token_template_directive_start] = true,
[ts_external_token_template_directive_end] = true,
[ts_external_token_heredoc_identifier] = true,
},
[2] = {
[ts_external_token_quoted_template_start] = true,
},
[3] = {
[ts_external_token_quoted_template_start] = true,
[ts_external_token_template_interpolation_end] = true,
},
[4] = {
[ts_external_token_template_directive_end] = true,
},
[5] = {
[ts_external_token_template_interpolation_end] = true,
},
[6] = {
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
},
[7] = {
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
[ts_external_token_heredoc_identifier] = true,
},
[8] = {
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
},
[9] = {
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
},
[10] = {
[ts_external_token_heredoc_identifier] = true,
},
[11] = {
[ts_external_token_quoted_template_end] = true,
},
};
static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
[0] = {
[ts_builtin_sym_end] = ACTIONS(1),
@@ -33070,6 +32982,81 @@ static const TSParseActionEntry ts_parse_actions[] = {
[1133] = {.entry = {.count = 1, .reusable = true}}, ACCEPT_INPUT(),
};
enum ts_external_scanner_symbol_identifiers {
ts_external_token_quoted_template_start = 0,
ts_external_token_quoted_template_end = 1,
ts_external_token__template_literal_chunk = 2,
ts_external_token_template_interpolation_start = 3,
ts_external_token_template_interpolation_end = 4,
ts_external_token_template_directive_start = 5,
ts_external_token_template_directive_end = 6,
ts_external_token_heredoc_identifier = 7,
};
static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = {
[ts_external_token_quoted_template_start] = sym_quoted_template_start,
[ts_external_token_quoted_template_end] = sym_quoted_template_end,
[ts_external_token__template_literal_chunk] = sym__template_literal_chunk,
[ts_external_token_template_interpolation_start] = sym_template_interpolation_start,
[ts_external_token_template_interpolation_end] = sym_template_interpolation_end,
[ts_external_token_template_directive_start] = sym_template_directive_start,
[ts_external_token_template_directive_end] = sym_template_directive_end,
[ts_external_token_heredoc_identifier] = sym_heredoc_identifier,
};
static const bool ts_external_scanner_states[12][EXTERNAL_TOKEN_COUNT] = {
[1] = {
[ts_external_token_quoted_template_start] = true,
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_interpolation_end] = true,
[ts_external_token_template_directive_start] = true,
[ts_external_token_template_directive_end] = true,
[ts_external_token_heredoc_identifier] = true,
},
[2] = {
[ts_external_token_quoted_template_start] = true,
},
[3] = {
[ts_external_token_quoted_template_start] = true,
[ts_external_token_template_interpolation_end] = true,
},
[4] = {
[ts_external_token_template_directive_end] = true,
},
[5] = {
[ts_external_token_template_interpolation_end] = true,
},
[6] = {
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
},
[7] = {
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
[ts_external_token_heredoc_identifier] = true,
},
[8] = {
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
[ts_external_token_template_interpolation_start] = true,
[ts_external_token_template_directive_start] = true,
},
[9] = {
[ts_external_token_quoted_template_end] = true,
[ts_external_token__template_literal_chunk] = true,
},
[10] = {
[ts_external_token_heredoc_identifier] = true,
},
[11] = {
[ts_external_token_quoted_template_end] = true,
},
};
#ifdef __cplusplus
extern "C" {
#endif

View File

@@ -13,9 +13,8 @@ extern "C" {
#define ts_builtin_sym_end 0
#define TREE_SITTER_SERIALIZATION_BUFFER_SIZE 1024
typedef uint16_t TSStateId;
#ifndef TREE_SITTER_API_H_
typedef uint16_t TSStateId;
typedef uint16_t TSSymbol;
typedef uint16_t TSFieldId;
typedef struct TSLanguage TSLanguage;
@@ -140,7 +139,8 @@ struct TSLanguage {
lexer->advance(lexer, skip); \
start: \
skip = false; \
lookahead = lexer->lookahead;
lookahead = lexer->lookahead; \
eof = lexer->eof(lexer);
#define ADVANCE(state_value) \
{ \
@@ -166,7 +166,7 @@ struct TSLanguage {
* Parse Table Macros
*/
#define SMALL_STATE(id) id - LARGE_STATE_COUNT
#define SMALL_STATE(id) ((id) - LARGE_STATE_COUNT)
#define STATE(id) id
@@ -176,7 +176,7 @@ struct TSLanguage {
{{ \
.shift = { \
.type = TSParseActionTypeShift, \
.state = state_value \
.state = (state_value) \
} \
}}
@@ -184,7 +184,7 @@ struct TSLanguage {
{{ \
.shift = { \
.type = TSParseActionTypeShift, \
.state = state_value, \
.state = (state_value), \
.repetition = true \
} \
}}