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

Clear LexTableBuilder's state after detecting conflicts

Browse source
This commit is contained in:
Max Brunsfeld 2017-08-25 17:00:24 -07:00
parent 4d63e26e9e
commit c285fbef38
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/compiler/build_tables/lex_table_builder.cc
View file

@ -90,6 +90,7 @@ class LexTableBuilderImpl : public LexTableBuilder {
}
separator_rules.push_back(Blank{});
separator_start_characters = separator_character_aggregator.result;
clear();
}
LexTable build(ParseTable *parse_table) {
@ -105,8 +106,6 @@ class LexTableBuilderImpl : public LexTableBuilder {
bool detect_conflict(Symbol::Index left, Symbol::Index right,
const vector<set<Symbol::Index>> &following_terminals_by_terminal_index) {
clear();
StartingCharacterAggregator left_starting_characters;
StartingCharacterAggregator right_starting_characters;
left_starting_characters.apply(grammar.variables[left].rule);
@ -144,7 +143,9 @@ class LexTableBuilderImpl : public LexTableBuilder {
current_conflict_detection_token_index = right;
current_conflict_detection_following_characters = following_characters_entry->second;
add_lex_state(item_set_for_terminals({{Symbol::terminal(left), {}}, {Symbol::terminal(right), {}}}));
return current_conflict_value;
bool result = current_conflict_value;
clear();
return result;
}
bool is_keyword(const LexicalVariable &variable) {