chore(deps): upgrade to tree-sitter@0.16.7

This commit is contained in:
Ika 2020-06-02 22:37:59 +08:00
parent cca2f85ad5
commit ea45e670ee
4 changed files with 3309 additions and 2346 deletions

View file

@ -1,4 +1,4 @@
git clone https://github.com/ikatyang/tree-sitter --branch 0.15.9-custom --depth 1 git clone https://github.com/ikatyang/tree-sitter --branch 0.16.7-custom --depth 1
cd tree-sitter cd tree-sitter
git submodule update --init git submodule update --init
./script/build-wasm ./script/build-wasm

56
src/node-types.json generated
View file

@ -197,7 +197,7 @@
"fields": {}, "fields": {},
"children": { "children": {
"multiple": true, "multiple": true,
"required": true, "required": false,
"types": [ "types": [
{ {
"type": "escape_sequence", "type": "escape_sequence",
@ -253,27 +253,23 @@
} }
}, },
{ {
"type": "comment", "type": "\"",
"named": true
},
{
"type": "[",
"named": false "named": false
}, },
{ {
"type": "]", "type": "\"\"\"",
"named": false "named": false
}, },
{ {
"type": "[[", "type": "'",
"named": false "named": false
}, },
{ {
"type": "]]", "type": "'''",
"named": false "named": false
}, },
{ {
"type": "=", "type": ",",
"named": false "named": false
}, },
{ {
@ -281,39 +277,23 @@
"named": false "named": false
}, },
{ {
"type": "\"", "type": "=",
"named": false "named": false
}, },
{ {
"type": "\"", "type": "[",
"named": false "named": false
}, },
{ {
"type": "\"\"\"", "type": "[[",
"named": false "named": false
}, },
{ {
"type": "\"\"\"", "type": "]",
"named": false "named": false
}, },
{ {
"type": "escape_sequence", "type": "]]",
"named": true
},
{
"type": "'",
"named": false
},
{
"type": "'",
"named": false
},
{
"type": "'''",
"named": false
},
{
"type": "'''",
"named": false "named": false
}, },
{ {
@ -321,24 +301,24 @@
"named": true "named": true
}, },
{ {
"type": "offset_date_time", "type": "escape_sequence",
"named": true
},
{
"type": "local_date_time",
"named": true "named": true
}, },
{ {
"type": "local_date", "type": "local_date",
"named": true "named": true
}, },
{
"type": "local_date_time",
"named": true
},
{ {
"type": "local_time", "type": "local_time",
"named": true "named": true
}, },
{ {
"type": ",", "type": "offset_date_time",
"named": false "named": true
}, },
{ {
"type": "{", "type": "{",

5537
src/parser.c generated

File diff suppressed because it is too large Load diff

View file

@ -45,7 +45,8 @@ struct TSLexer {
void (*advance)(TSLexer *, bool); void (*advance)(TSLexer *, bool);
void (*mark_end)(TSLexer *); void (*mark_end)(TSLexer *);
uint32_t (*get_column)(TSLexer *); uint32_t (*get_column)(TSLexer *);
bool (*is_at_included_range_start)(TSLexer *); bool (*is_at_included_range_start)(const TSLexer *);
bool (*eof)(const TSLexer *);
}; };
typedef enum { typedef enum {
@ -61,13 +62,13 @@ typedef struct {
TSStateId state; TSStateId state;
bool extra : 1; bool extra : 1;
bool repetition : 1; bool repetition : 1;
}; } shift;
struct { struct {
TSSymbol symbol; TSSymbol symbol;
int16_t dynamic_precedence; int16_t dynamic_precedence;
uint8_t child_count; uint8_t child_count;
uint8_t production_id; uint8_t production_id;
}; } reduce;
} params; } params;
TSParseActionType type : 4; TSParseActionType type : 4;
} TSParseAction; } TSParseAction;
@ -82,7 +83,7 @@ typedef union {
struct { struct {
uint8_t count; uint8_t count;
bool reusable : 1; bool reusable : 1;
}; } entry;
} TSParseActionEntry; } TSParseActionEntry;
struct TSLanguage { struct TSLanguage {
@ -114,6 +115,10 @@ struct TSLanguage {
const TSFieldMapSlice *field_map_slices; const TSFieldMapSlice *field_map_slices;
const TSFieldMapEntry *field_map_entries; const TSFieldMapEntry *field_map_entries;
const char **field_names; const char **field_names;
uint32_t large_state_count;
const uint16_t *small_parse_table;
const uint32_t *small_parse_table_map;
const TSSymbol *public_symbol_map;
}; };
/* /*
@ -123,6 +128,7 @@ struct TSLanguage {
#define START_LEXER() \ #define START_LEXER() \
bool result = false; \ bool result = false; \
bool skip = false; \ bool skip = false; \
bool eof = false; \
int32_t lookahead; \ int32_t lookahead; \
goto start; \ goto start; \
next_state: \ next_state: \
@ -155,26 +161,34 @@ struct TSLanguage {
* Parse Table Macros * Parse Table Macros
*/ */
#define SMALL_STATE(id) id - LARGE_STATE_COUNT
#define STATE(id) id #define STATE(id) id
#define ACTIONS(id) id #define ACTIONS(id) id
#define SHIFT(state_value) \ #define SHIFT(state_value) \
{ \ { \
{ \ { \
.type = TSParseActionTypeShift, \ .params = { \
.params = {.state = state_value}, \ .shift = { \
} \ .state = state_value \
} \
}, \
.type = TSParseActionTypeShift \
} \
} }
#define SHIFT_REPEAT(state_value) \ #define SHIFT_REPEAT(state_value) \
{ \ { \
{ \ { \
.type = TSParseActionTypeShift, \
.params = { \ .params = { \
.state = state_value, \ .shift = { \
.repetition = true \ .state = state_value, \
.repetition = true \
} \
}, \ }, \
.type = TSParseActionTypeShift \
} \ } \
} }
@ -186,20 +200,26 @@ struct TSLanguage {
#define SHIFT_EXTRA() \ #define SHIFT_EXTRA() \
{ \ { \
{ \ { \
.type = TSParseActionTypeShift, \ .params = { \
.params = {.extra = true} \ .shift = { \
.extra = true \
} \
}, \
.type = TSParseActionTypeShift \
} \ } \
} }
#define REDUCE(symbol_val, child_count_val, ...) \ #define REDUCE(symbol_val, child_count_val, ...) \
{ \ { \
{ \ { \
.type = TSParseActionTypeReduce, \
.params = { \ .params = { \
.symbol = symbol_val, \ .reduce = { \
.child_count = child_count_val, \ .symbol = symbol_val, \
__VA_ARGS__ \ .child_count = child_count_val, \
} \ __VA_ARGS__ \
}, \
}, \
.type = TSParseActionTypeReduce \
} \ } \
} }