From e181426f6faac3a95ef7b1cee15fe3a45f3fd066 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sun, 7 Sep 2014 22:58:45 -0700 Subject: [PATCH] Use make_tuple rather than init list syntax for gcc --- src/compiler/prepare_grammar/extract_tokens.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/compiler/prepare_grammar/extract_tokens.cc b/src/compiler/prepare_grammar/extract_tokens.cc index 2686f5b4..2f65f290 100644 --- a/src/compiler/prepare_grammar/extract_tokens.cc +++ b/src/compiler/prepare_grammar/extract_tokens.cc @@ -24,6 +24,7 @@ using std::to_string; using std::vector; using std::set; using std::make_shared; +using std::make_tuple; using std::dynamic_pointer_cast; using rules::rule_ptr; using rules::Symbol; @@ -140,20 +141,20 @@ tuple extract_tokens( } else { auto sym = dynamic_pointer_cast(extractor.apply(rule)); if (!sym.get()) - return { SyntaxGrammar(), LexicalGrammar(), - ubiq_token_err("Not a token: " + rule->to_string()) }; + return make_tuple(SyntaxGrammar(), LexicalGrammar(), + ubiq_token_err("Not a token: " + rule->to_string())); Symbol symbol = inliner.replace_symbol(*sym); if (!symbol.is_token()) - return { SyntaxGrammar(), LexicalGrammar(), - ubiq_token_err("Not a token: " + symbol.to_string()) }; + return make_tuple(SyntaxGrammar(), LexicalGrammar(), + ubiq_token_err("Not a token: " + symbol.to_string())); ubiquitous_tokens.insert(symbol); } } - return { SyntaxGrammar(rules, aux_rules, ubiquitous_tokens), - LexicalGrammar(tokens, aux_tokens, separators), nullptr }; + return make_tuple(SyntaxGrammar(rules, aux_rules, ubiquitous_tokens), + LexicalGrammar(tokens, aux_tokens, separators), nullptr); } } // namespace prepare_grammar