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

Avoid duplicate error state entries for tokens that are both internal & external

Browse source
This commit is contained in:
Max Brunsfeld 2017-09-14 10:54:09 -07:00
parent 2721f72c41
commit 91456d7a17
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/build_tables/parse_table_builder.cc
View file

@ -161,7 +161,9 @@ class ParseTableBuilderImpl : public ParseTableBuilder {
}
for (size_t i = 0; i < grammar.external_tokens.size(); i++) {
parse_table.states[state_id].terminal_entries[Symbol::external(i)].actions.push_back(ParseAction::Recover());
if (grammar.external_tokens[i].corresponding_internal_token == rules::NONE()) {
parse_table.states[state_id].terminal_entries[Symbol::external(i)].actions.push_back(ParseAction::Recover());
}
}
parse_table.add_terminal_action(state_id, END_OF_INPUT(), ParseAction::Recover());

9
src/runtime/parser.c
View file

@ -19,11 +19,10 @@
parser__log(self); \
} \
#define LOG_STACK() \
if (self->print_debugging_graphs) { \
ts_stack_print_dot_graph(self->stack, self->language->symbol_names, \
stderr); \
fputs("\n\n", stderr); \
#define LOG_STACK() \
if (self->print_debugging_graphs) { \
ts_stack_print_dot_graph(self->stack, self->language->symbol_names, stderr); \
fputs("\n\n", stderr); \
}
#define LOG_TREE() \