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

Don't have both shift and shift-extra actions in recovery states

Browse source
This commit is contained in:
Max Brunsfeld 2016-07-17 07:25:57 -07:00
parent 1faa7c60f9
commit 0ee1994078
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/compiler/build_tables/build_parse_table.cc
View file

@ -115,13 +115,12 @@ class ParseTableBuilder {
void build_error_parse_state() {
ParseState error_state;
for (const Symbol &symbol : recovery_tokens(lexical_grammar)) {
for (const Symbol &symbol : recovery_tokens(lexical_grammar))
add_out_of_context_parse_state(&error_state, symbol);
}
for (const Symbol &symbol : grammar.extra_tokens) {
error_state.entries[symbol].actions.push_back(ParseAction::ShiftExtra());
}
for (const Symbol &symbol : grammar.extra_tokens)
if (!error_state.entries.count(symbol))
error_state.entries[symbol].actions.push_back(ParseAction::ShiftExtra());
for (size_t i = 0; i < grammar.variables.size(); i++) {
Symbol symbol(i, false);
@ -197,8 +196,13 @@ class ParseTableBuilder {
void add_shift_extra_actions(ParseStateId state_id) {
ParseAction action = ParseAction::ShiftExtra();
ParseState &state = parse_table.states[state_id];
for (const Symbol &extra_symbol : grammar.extra_tokens)
add_action(state_id, extra_symbol, action, null_item_set);
if (!state.entries.count(extra_symbol) ||
(allow_any_conflict &&
state.entries[extra_symbol].actions.back().type ==
ParseActionTypeReduce))
parse_table.add_action(state_id, extra_symbol, action);
}
void add_reduce_extra_actions(ParseStateId state_id) {