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

Include shift-extra actions alongside other actions in recovery states

Browse source
This commit is contained in:
Max Brunsfeld 2016-05-10 13:36:10 -07:00
parent 19bd09b81d
commit 507d5ad9f7
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,19 +64,17 @@ class ParseTableBuilder {
}));
CompileError error = process_part_state_queue();
if (error.type != TSCompileErrorTypeNone) {
if (error.type != TSCompileErrorTypeNone)
return { parse_table, error };
}
add_out_of_context_parse_states();
allow_any_conflict = true;
process_part_state_queue();
allow_any_conflict = false;
for (ParseStateId state = 0; state < parse_table.states.size(); state++) {
add_shift_extra_actions(state);
for (ParseStateId state = 0; state < parse_table.states.size(); state++)
add_reduce_extra_actions(state);
}
mark_fragile_actions();
remove_duplicate_parse_states();
@ -95,6 +93,7 @@ class ParseTableBuilder {
add_reduce_actions(item_set, state_id);
add_shift_actions(item_set, state_id);
add_shift_extra_actions(state_id);
if (!conflicts.empty()) {
return CompileError(TSCompileErrorTypeParseConflict,