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: Now retains a copy of the augmented grammar

Browse source
This commit is contained in:
Paul Beckingham 2016-01-02 10:43:14 -05:00
parent 81fe18ec20
commit 61ef17813a
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/LR0.cpp
View file

@ -50,13 +50,13 @@ LR0::LR0 ()
void LR0::initialize (const Grammar& grammar) void LR0::initialize (const Grammar& grammar)
{ {
// Obtain the augmented grammar. // Obtain the augmented grammar.
auto augmented = grammar.augmented (); auto _augmented = grammar.augmented ();
if (_debug) if (_debug)
{ {
std::cout << "Augmented Grammar\n"; std::cout << "Augmented Grammar\n";
auto count = 0; auto count = 0;
for (auto& item : augmented) for (auto& item : _augmented)
{ {
std::cout << " [" << count++ << "]"; std::cout << " [" << count++ << "]";
for (auto& term : item) for (auto& term : item)
@ -69,8 +69,8 @@ void LR0::initialize (const Grammar& grammar)
// TODO Expand this single interation into a loop that ends when there is no // TODO Expand this single interation into a loop that ends when there is no
// more expanѕion. // more expanѕion.
Item item0 {augmented[0]}; Item item0 {_augmented[0]};
auto closure = getClosure (item0, augmented); auto closure = getClosure (item0);
States states; States states;
states.push_back (closure); states.push_back (closure);
@ -90,9 +90,7 @@ void LR0::initialize (const Grammar& grammar)
// until no more items can be added to J; // until no more items can be added to J;
// return J // return J
// end // end
LR0::Closure LR0::getClosure ( LR0::Closure LR0::getClosure (const Item& item)
const Item& item,
const std::vector <std::vector <std::string>>& augmented)
{ {
LR0::Closure closure; LR0::Closure closure;
closure.push_back (item); closure.push_back (item);

7
src/LR0.h
View file

@ -63,9 +63,14 @@ public:
}; };
private: private:
Closure getClosure (const Item&, const std::vector <std::vector <std::string>>&); Closure getClosure (const Item&);
private: private:
// Copy of the augmented grammar.
std::vector <std::vector <std::string>> _augmented;
// state column result // state column result
// | | | // | | |
std::map <int, std::map <std::string, std::string>> _actions; std::map <int, std::map <std::string, std::string>> _actions;