diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-04-18 19:25:22 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-04-18 19:25:22 +0200 |
commit | 30c2141182f4eed1d3549603a7aa92c57b35d129 (patch) | |
tree | 914f3e0ecd12072da94ce4b4865abb0c08ad1856 /src/generator.cpp | |
parent | 96d622144919a84508cf50eba1b1328ca44d1fed (diff) | |
download | solar-30c2141182f4eed1d3549603a7aa92c57b35d129.tar solar-30c2141182f4eed1d3549603a7aa92c57b35d129.zip |
Replace all make_pair calls with initializer lists
Diffstat (limited to 'src/generator.cpp')
-rw-r--r-- | src/generator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/generator.cpp b/src/generator.cpp index 1a4c79f..59f96b1 100644 --- a/src/generator.cpp +++ b/src/generator.cpp @@ -87,7 +87,7 @@ void generator_t::generate() { item_t shifted = item; shifted.shift(); - std::set<item_t> &set = new_sets.insert(std::make_pair(sym, empty_set)).first->second; + std::set<item_t> &set = new_sets.insert({sym, empty_set}).first->second; set.insert(std::move(shifted)); } @@ -122,11 +122,11 @@ generator_t::generator_t(const grammar_t &grammar0) : grammar(grammar0) { item_t rule = grammar.rules[i].item; nonterminals.insert(rule.get_lhs()); - nonterms.insert(std::make_pair(rule.get_lhs(), i)); + nonterms.insert({rule.get_lhs(), i}); while (rule.has_next()) { const symbol_t &sym = rule.get_next_symbol(); - items.insert(std::make_pair(sym, rule)); + items.insert({sym, rule}); if (sym.get_type() != SYMBOL_TYPE_NONTERM) terminals.insert(sym); @@ -134,7 +134,7 @@ generator_t::generator_t(const grammar_t &grammar0) : grammar(grammar0) { rule.shift(); } - rule_ids.insert(std::make_pair(rule, i)); + rule_ids.insert({rule, i}); } } |