diff options
Diffstat (limited to 'src/output_source_slr.cpp')
-rw-r--r-- | src/output_source_slr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/output_source_slr.cpp b/src/output_source_slr.cpp index 420d682..1a92ba0 100644 --- a/src/output_source_slr.cpp +++ b/src/output_source_slr.cpp @@ -33,11 +33,11 @@ void output_source_slr_t::emit_state_shift(unsigned state) { std::map<unsigned, std::set<symbol_t>> shifts; for (const symbol_t &token : get_generator()->get_terminals()) { - auto it = get_generator()->get_shifts().find(std::make_pair(state, token)); + auto it = get_generator()->get_shifts().find({state, token}); if (it == get_generator()->get_shifts().end()) continue; - std::set<symbol_t> &symbols = shifts.insert(std::make_pair(it->second, std::set<symbol_t>())).first->second; + std::set<symbol_t> &symbols = shifts.insert({it->second, std::set<symbol_t>()}).first->second; symbols.insert(token); } @@ -92,11 +92,11 @@ bool output_source_slr_t::emit_state_reduce(unsigned state) { std::map<unsigned, std::set<symbol_t>> reductions; for (const symbol_t &token : get_generator()->get_terminals()) { - auto it = get_generator()->get_reductions().find(std::make_pair(state, token)); + auto it = get_generator()->get_reductions().find({state, token}); if (it == get_generator()->get_reductions().end()) continue; - std::set<symbol_t> &symbols = reductions.insert(std::make_pair(it->second, std::set<symbol_t>())).first->second; + std::set<symbol_t> &symbols = reductions.insert({it->second, std::set<symbol_t>()}).first->second; symbols.insert(token); } @@ -132,7 +132,7 @@ bool output_source_slr_t::emit_state_reduce(unsigned state) { void output_source_slr_t::emit_state(unsigned state) { block_t switch_token(this, "switch (token)"); - if (get_generator()->get_shifts().find(std::make_pair(state, symbol_t::make_nonterm(""))) != get_generator()->get_shifts().end()) { + if (get_generator()->get_shifts().find({state, symbol_t::make_nonterm("")}) != get_generator()->get_shifts().end()) { write_case(0); write_line_("return 0"); write_line(); |