fluencelabs/lalrpop
1
0
Fork 0
mirror of https://github.com/fluencelabs/lalrpop synced 2025-06-07 07:21:24 +00:00
Code Issues Projects Releases Wiki Activity

shift conflicts do not need to be traced

Browse Source
This commit is contained in:
Niko Matsakis 2016-03-06 06:05:09 -05:00
parent ed089c27fd
commit e72378d2bc
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lalrpop/src/lr1/lane_table/lane/mod.rs
View File

@ -41,7 +41,26 @@ impl<'trace, 'grammar> LaneTracer<'trace, 'grammar> {
conflict: ConflictIndex, conflict: ConflictIndex,
item: LR0Item<'grammar>) { item: LR0Item<'grammar>) {
let mut visited_set = Set::default(); let mut visited_set = Set::default();
self.continue_trace(state, conflict, item, &mut visited_set);
// if the conflict item is a "shift" item, then the context
// is always the termianl to shift (and conflicts only arise
// around shifting terminal, so it must be a terminal)
match item.shift_symbol() {
Some((Symbol::Terminal(term), _)) => {
let mut token_set = TokenSet::new(self.grammar);
token_set.insert(self.grammar, Token::Terminal(term));
self.table.add_lookahead(state, conflict, &token_set);
}
Some((Symbol::Nonterminal(_), _)) => {
panic!("invalid conflict item `{:?}`: shifts nonterminal",
item);
}
None => {
self.continue_trace(state, conflict, item, &mut visited_set);
}
}
} }
fn continue_trace(&mut self, fn continue_trace(&mut self,