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

Handle conflicts in repeat rules after external tokens

Browse source 
Signed-off-by: Rick Winfrey <rewinfrey@github.com>
This commit is contained in:
Max Brunsfeld 2018-02-14 11:24:51 -08:00 • committed by Rick Winfrey
parent facafcd6e4
commit 2daae48fe0
4 changed files with 100 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -602,9 +602,9 @@ class ParseTableBuilderImpl : public ParseTableBuilder {
for (auto &preceding_symbol : preceding_symbols) {
ParseState &preceding_state = parse_table.states[preceding_state_id];
if (preceding_state.nonterminal_entries.count(symbol.index)) break;
preceding_state_id = preceding_symbol.is_terminal() ?
preceding_state.terminal_entries[preceding_symbol].actions.back().state_index :
preceding_state.nonterminal_entries[preceding_symbol.index];
preceding_state_id = preceding_symbol.is_non_terminal() ?
preceding_state.nonterminal_entries[preceding_symbol.index] :
preceding_state.terminal_entries[preceding_symbol].actions.back().state_index;
}
const ParseItemSet &preceding_item_set = *item_sets_by_state_id[preceding_state_id];
for (auto &preceding_entry : preceding_item_set.entries) {