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

This commit is contained in:
Ika 2020-05-24 17:29:51 +08:00
parent 9ad0d6667b
commit c4dc80576b
4 changed files with 28465 additions and 20861 deletions

View file

@ -1,5 +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
git submodule update --init
./script/build-wasm
cargo build --release

361
src/node-types.json generated
View file

@ -1,6 +1,21 @@
[
{
"type": "stream",
"type": "block_mapping",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "block_mapping_pair",
"named": true
}
]
}
},
{
"type": "block_mapping_pair",
"named": true,
"fields": {
"key": {
@ -8,7 +23,11 @@
"required": false,
"types": [
{
"type": "flow_pair",
"type": "block_node",
"named": true
},
{
"type": "flow_node",
"named": true
}
]
@ -17,6 +36,146 @@
"multiple": false,
"required": false,
"types": [
{
"type": "block_node",
"named": true
},
{
"type": "flow_node",
"named": true
}
]
}
}
},
{
"type": "block_node",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "anchor",
"named": true
},
{
"type": "block_mapping",
"named": true
},
{
"type": "block_scalar",
"named": true
},
{
"type": "block_sequence",
"named": true
},
{
"type": "tag",
"named": true
}
]
}
},
{
"type": "block_scalar",
"named": true,
"fields": {}
},
{
"type": "block_sequence",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "block_sequence_item",
"named": true
}
]
}
},
{
"type": "block_sequence_item",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": false,
"types": [
{
"type": "block_node",
"named": true
},
{
"type": "flow_node",
"named": true
}
]
}
},
{
"type": "document",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "block_node",
"named": true
},
{
"type": "flow_node",
"named": true
},
{
"type": "reserved_directive",
"named": true
},
{
"type": "tag_directive",
"named": true
},
{
"type": "yaml_directive",
"named": true
}
]
}
},
{
"type": "double_quote_scalar",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "escape_sequence",
"named": true
}
]
}
},
{
"type": "flow_mapping",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "flow_node",
"named": true
},
{
"type": "flow_pair",
"named": true
@ -24,6 +183,132 @@
]
}
},
{
"type": "flow_node",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "alias",
"named": true
},
{
"type": "anchor",
"named": true
},
{
"type": "double_quote_scalar",
"named": true
},
{
"type": "flow_mapping",
"named": true
},
{
"type": "flow_sequence",
"named": true
},
{
"type": "plain_scalar",
"named": true
},
{
"type": "single_quote_scalar",
"named": true
},
{
"type": "tag",
"named": true
}
]
}
},
{
"type": "flow_pair",
"named": true,
"fields": {
"key": {
"multiple": false,
"required": false,
"types": [
{
"type": "flow_node",
"named": true
}
]
},
"value": {
"multiple": false,
"required": false,
"types": [
{
"type": "flow_node",
"named": true
}
]
}
}
},
{
"type": "flow_sequence",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "flow_node",
"named": true
},
{
"type": "flow_pair",
"named": true
}
]
}
},
{
"type": "reserved_directive",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "directive_name",
"named": true
},
{
"type": "directive_parameter",
"named": true
}
]
}
},
{
"type": "single_quote_scalar",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
"types": [
{
"type": "escape_sequence",
"named": true
}
]
}
},
{
"type": "stream",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": false,
@ -31,12 +316,82 @@
{
"type": "document",
"named": true
}
]
}
},
{
"type": "flow_pair",
"type": "tag_directive",
"named": true,
"fields": {},
"children": {
"multiple": true,
"required": true,
"types": [
{
"type": "tag_handle",
"named": true
},
{
"type": "tag_prefix",
"named": true
}
]
}
},
{
"type": "yaml_directive",
"named": true,
"fields": {},
"children": {
"multiple": false,
"required": true,
"types": [
{
"type": "yaml_version",
"named": true
}
]
}
},
{
"type": "alias",
"named": true
},
{
"type": "anchor",
"named": true
},
{
"type": "directive_name",
"named": true
},
{
"type": "directive_parameter",
"named": true
},
{
"type": "escape_sequence",
"named": true
},
{
"type": "plain_scalar",
"named": true
},
{
"type": "tag",
"named": true
},
{
"type": "tag_handle",
"named": true
},
{
"type": "tag_prefix",
"named": true
},
{
"type": "yaml_version",
"named": true
}
]

48898
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 (*mark_end)(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 {
@ -61,13 +62,13 @@ typedef struct {
TSStateId state;
bool extra : 1;
bool repetition : 1;
};
} shift;
struct {
TSSymbol symbol;
int16_t dynamic_precedence;
uint8_t child_count;
uint8_t production_id;
};
} reduce;
} params;
TSParseActionType type : 4;
} TSParseAction;
@ -82,7 +83,7 @@ typedef union {
struct {
uint8_t count;
bool reusable : 1;
};
} entry;
} TSParseActionEntry;
struct TSLanguage {
@ -114,6 +115,10 @@ struct TSLanguage {
const TSFieldMapSlice *field_map_slices;
const TSFieldMapEntry *field_map_entries;
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() \
bool result = false; \
bool skip = false; \
bool eof = false; \
int32_t lookahead; \
goto start; \
next_state: \
@ -155,6 +161,8 @@ struct TSLanguage {
* Parse Table Macros
*/
#define SMALL_STATE(id) id - LARGE_STATE_COUNT
#define STATE(id) id
#define ACTIONS(id) id
@ -162,19 +170,25 @@ struct TSLanguage {
#define SHIFT(state_value) \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = {.state = state_value}, \
.params = { \
.shift = { \
.state = state_value \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
#define SHIFT_REPEAT(state_value) \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = { \
.shift = { \
.state = state_value, \
.repetition = true \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
@ -186,20 +200,26 @@ struct TSLanguage {
#define SHIFT_EXTRA() \
{ \
{ \
.type = TSParseActionTypeShift, \
.params = {.extra = true} \
.params = { \
.shift = { \
.extra = true \
} \
}, \
.type = TSParseActionTypeShift \
} \
}
#define REDUCE(symbol_val, child_count_val, ...) \
{ \
{ \
.type = TSParseActionTypeReduce, \
.params = { \
.reduce = { \
.symbol = symbol_val, \
.child_count = child_count_val, \
__VA_ARGS__ \
} \
}, \
}, \
.type = TSParseActionTypeReduce \
} \
}