GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

LR0: Capture state transitions during closure

Browse source
This commit is contained in:
Paul Beckingham 2016-01-07 22:22:45 -05:00
parent 67b497733f
commit 227c5ae8e5
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/LR0.cpp
View file

@ -135,6 +135,7 @@ void LR0::closeState (States& states, const int state) const
{ {
Item advanced (item); Item advanced (item);
advanced.advance (); advanced.advance ();
advanced.setTransition (state);
closure.push_back (advanced); closure.push_back (advanced);
if (! advanced.done ()) if (! advanced.done ())
@ -148,6 +149,7 @@ void LR0::closeState (States& states, const int state) const
{ {
Item additional (_augmented[r]); Item additional (_augmented[r]);
additional.setGrammarRuleIndex (r); additional.setGrammarRuleIndex (r);
additional.setTransition (state);
closure.push_back (additional); closure.push_back (additional);
seen.insert (nextSymbol); seen.insert (nextSymbol);
} }
@ -290,9 +292,9 @@ LR0::Item::Item (const std::vector <std::string>& rule)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool LR0::Item::operator== (const Item& other) bool LR0::Item::operator== (const Item& other)
{ {
// Deliberately ignores _transitionsTo.
if (_cursor != other._cursor || if (_cursor != other._cursor ||
_grammarRule != other._grammarRule || _grammarRule != other._grammarRule ||
_transitionsTo != other._transitionsTo ||
_rule.size () != other._rule.size ()) _rule.size () != other._rule.size ())
return false; return false;