Merge pull request #67 from filipsajdak/fsajdak-fix-preserve-parens

[FIX] preserve parens around expressions calculating value of argument for a function call

Author: hsutter

source/cppfront.cpp

@@ -1980,15 +1980,17 @@ class cppfront
     auto emit(expression_node const& n) -> void
     {
         assert(n.expr);
+        push_need_expression_list_parens(true);
         emit(*n.expr);
+        pop_need_expression_list_parens();
     }
 
 
     //-----------------------------------------------------------------------
     //
     auto emit(expression_list_node const& n) -> void
     {
-        if (should_add_expression_list_parens() && !n.expressions.empty()) {
+        if (should_add_expression_list_parens() && !n.expressions.empty() && !n.inside_initializer) {
             printer.print_cpp2("(", n.position());
         }
 
@@ -2022,7 +2024,7 @@ class cppfront
             }
         }
 
-        if (should_add_expression_list_parens() && !n.expressions.empty()) {
+        if (should_add_expression_list_parens() && !n.expressions.empty() && !n.inside_initializer) {
             printer.print_cpp2(")", n.position());
         }
         //  We want to consume only one of these

source/parse.h

@@ -257,6 +257,7 @@ struct expression_list_node
 {
     source_position open_paren  = {};
     source_position close_paren = {};
+    bool inside_initializer     = false;
 
     struct term {
         passing_style                    pass = {};
@@ -1317,9 +1318,10 @@ class parser
 
         if (curr().type() == lexeme::LeftParen)
         {
+            bool inside_initializer = (peek(-1)->type() == lexeme::Assignment);
             auto open_paren = curr().position();
             next();
-            auto expr_list = expression_list(open_paren);
+            auto expr_list = expression_list(open_paren, inside_initializer);
             if (!expr_list) {
                 error("unexpected text - ( is not followed by an expression-list");
                 next();
@@ -1704,10 +1706,11 @@ class parser
     //G     expression
     //G     expression-list , expression
     //G
-    auto expression_list(source_position open_paren) -> std::unique_ptr<expression_list_node> {
+    auto expression_list(source_position open_paren, bool inside_initializer = false) -> std::unique_ptr<expression_list_node> {
         auto pass = passing_style::in;
         auto n = std::make_unique<expression_list_node>();
         n->open_paren = open_paren;
+        n->inside_initializer = inside_initializer;
 
         if (curr().type() == lexeme::Identifier && curr() == "out") {
             pass = passing_style::out;