summaryrefslogtreecommitdiffstats
path: root/src/generator.hpp
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2015-04-18 19:25:22 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2015-04-18 19:25:22 +0200
commit30c2141182f4eed1d3549603a7aa92c57b35d129 (patch)
tree914f3e0ecd12072da94ce4b4865abb0c08ad1856 /src/generator.hpp
parent96d622144919a84508cf50eba1b1328ca44d1fed (diff)
downloadsolar-30c2141182f4eed1d3549603a7aa92c57b35d129.tar
solar-30c2141182f4eed1d3549603a7aa92c57b35d129.zip
Replace all make_pair calls with initializer lists
Diffstat (limited to 'src/generator.hpp')
-rw-r--r--src/generator.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/generator.hpp b/src/generator.hpp
index 0511b23..124e11b 100644
--- a/src/generator.hpp
+++ b/src/generator.hpp
@@ -63,18 +63,18 @@ private:
std::set<item_t> get_set(const std::string &nonterm);
std::pair<std::map<std::set<item_t>, size_t>::iterator, bool> add_set(const std::set<item_t> &set) {
- return itemsets.insert(std::make_pair(set, itemsets.size()));
+ return itemsets.insert({set, itemsets.size()});
}
void add_shift(size_t from, const symbol_t &sym, size_t to) {
if (has_reduce_conflict(from, sym))
throw conflict_error("shift/reduce conflict");
- shifts.insert(std::make_pair(std::make_pair(from, sym), to));
+ shifts.insert({{from, sym}, to});
}
void add_goto(size_t from, const std::string &nonterm, size_t to) {
- gotos.insert(std::make_pair(std::make_pair(from, nonterm), to));
+ gotos.insert({{from, nonterm}, to});
}
protected: