summaryrefslogtreecommitdiffstats
path: root/src/generator.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2015-04-02 11:52:05 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2015-04-02 11:52:05 +0200
commit61c3aa15c347624cb3c4a3106235d061e718ccad (patch)
tree13e3b3c65ab36636e6b62c8c1315e5030d37ccb9 /src/generator.cpp
parentab2d315aa2daf404bc6abab2f8f20f72803b8898 (diff)
downloadsolar-61c3aa15c347624cb3c4a3106235d061e718ccad.tar
solar-61c3aa15c347624cb3c4a3106235d061e718ccad.zip
Add simple output generator
Diffstat (limited to 'src/generator.cpp')
-rw-r--r--src/generator.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/generator.cpp b/src/generator.cpp
index a9a20aa..f336772 100644
--- a/src/generator.cpp
+++ b/src/generator.cpp
@@ -96,12 +96,10 @@ void generator_t::generate_itemsets() {
auto added = add_set(entry.second);
- auto action = std::make_pair(std::make_pair(cur.second, entry.first), added.first->second);
-
if (entry.first.get_type() == SYMBOL_TYPE_NONTERM)
- gotos.insert(std::move(action));
+ gotos.emplace(std::make_pair(cur.second, entry.first.get_value()), added.first->second);
else
- shifts.insert(std::move(action));
+ shifts.emplace(std::make_pair(cur.second, entry.first), added.first->second);
if (added.second)
queue.push(*added.first);