traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up parser fields

Browse source
This commit is contained in:
Max Brunsfeld 2017-08-31 12:50:10 -07:00
parent 4a0587061e
commit ac9d260734
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/runtime/parser.c
View file

@ -424,7 +424,7 @@ static Tree *parser__get_lookahead(Parser *self, StackVersion version, TSStateId
reason = "is_error";
} else if (result->fragile_left || result->fragile_right) {
reason = "is_fragile";
} else if (self->is_split && result->child_count) {
} else if (self->in_ambiguity && result->child_count) {
reason = "in_ambiguity";
}
@ -630,7 +630,7 @@ static StackPopResult parser__reduce(Parser *self, StackVersion version,
TSStateId state = ts_stack_top_state(self->stack, slice.version);
TSStateId next_state = ts_language_next_state(self->language, state, symbol);
if (fragile || self->is_split || pop.slices.size > 1 || initial_version_count > 1) {
if (fragile || self->in_ambiguity || pop.slices.size > 1 || initial_version_count > 1) {
parent->fragile_left = true;
parent->fragile_right = true;
parent->parse_state = TS_TREE_STATE_NONE;
@ -1332,7 +1332,7 @@ Tree *parser_parse(Parser *self, TSInput input, Tree *old_tree, bool halt_on_err
break;
}
self->is_split = (version > 1);
self->in_ambiguity = version > 1;
} while (version != 0);
LOG("done");

5
src/runtime/parser.h
View file

@ -23,15 +23,14 @@ typedef struct {
const TSLanguage *language;
ReduceActionSet reduce_actions;
Tree *finished_tree;
bool is_split;
bool print_debugging_graphs;
Tree scratch_tree;
TokenCache token_cache;
ReusableNode reusable_node;
TreePath tree_path1;
TreePath tree_path2;
void *external_scanner_payload;
Tree *last_external_token;
bool in_ambiguity;
bool print_debugging_graphs;
} Parser;
bool parser_init(Parser *);