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: Modified ::getExpectedSymbols to use index-based looping

Browse source 
- Index-based looping makes it easier to link the items in the states to be
  linked back to the augmented grammar.
This commit is contained in:
Paul Beckingham 2016-01-03 17:24:32 -05:00
parent c02b6f62c0
commit c7aa6a3beb
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/LR0.cpp
View file

@ -80,7 +80,8 @@ void LR0::initialize (const Grammar& grammar)
}
////////////////////////////////////////////////////////////////////////////////
// Collect a unique set of expected symbols from the closure.
// Collect a unique set of expected symbols from the closure. This is the set
// of symbols where '● X' appears in an item.
std::set <std::string> LR0::getExpectedSymbols (const Closure& closure) const
{
std::set <std::string> expected;
@ -98,22 +99,25 @@ LR0::Closure LR0::getClosure (const std::string& symbol) const
std::set <std::string> seen;
LR0::Closure result;
for (auto& rule : _augmented)
for (unsigned int r = 0; r < _augmented.size (); ++r)
{
if (rule[0] == symbol)
if (_augmented[r][0] == symbol)
{
Item item (rule);
Item item (_augmented[r]);
item.setGrammarRuleIndex (r);
result.push_back (item);
seen.insert (rule[0]);
seen.insert (_augmented[r][0]);
auto nextSymbol = item.next ();
if (seen.find (nextSymbol) == seen.end ())
{
for (auto& rule : _augmented)
for (unsigned int r = 0; r < _augmented.size (); ++r)
{
if (rule[0] == nextSymbol)
if (_augmented[r][0] == nextSymbol)
{
result.push_back (Item (rule));
Item item (_augmented[r]);
item.setGrammarRuleIndex (r);
result.push_back (item);
seen.insert (nextSymbol);
}
}