refactor: emit like a returned expression list

Author: JohelEGP

regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp

@@ -20,11 +20,11 @@ auto main() -> int;
 auto main() -> int{
   using vec = std::vector<int>;
   vec v {0}; 
-  v      = {};
+  v      = {  };
   cpp2::Default.expects(v==vec(), "");
-  v = {1};
+  v = { 1 };
   cpp2::Default.expects(v==vec(1), "");
-  v = {2, 3};
+  v = { 2, 3 };
   cpp2::Default.expects(std::move(v)==vec(2, 3), "");
 }
 

regression-tests/test-results/pure2-types-smf-and-that-1-provide-everything.cpp

@@ -143,7 +143,7 @@ auto main() -> int{
     CPP2_UFCS(print, z, "   cp-assign     ", " <- ");
     CPP2_UFCS(print, y, "", "\n");
 
-    z = {std::move(y)};
+    z = { std::move(y) };
     CPP2_UFCS(print, std::move(z), "   mv-assign     ", " <- ");
     CPP2_UFCS(print, std::move(y), "", "\n");
 }

regression-tests/test-results/pure2-types-smf-and-that-2-provide-mvconstruct-and-cpassign.cpp

@@ -148,7 +148,7 @@ auto main() -> int{
     CPP2_UFCS(print, z, "   cp-assign     ", " <- ");
     CPP2_UFCS(print, y, "", "\n");
 
-    z = {std::move(y)};
+    z = { std::move(y) };
     CPP2_UFCS(print, std::move(z), "   mv-assign     ", " <- ");
     CPP2_UFCS(print, std::move(y), "", "\n");
 }

regression-tests/test-results/pure2-types-smf-and-that-3-provide-mvconstruct-and-mvassign.cpp

@@ -147,7 +147,7 @@ auto main() -> int{
     CPP2_UFCS(print, z, "   cp-assign     ", " <- ");
     CPP2_UFCS(print, y, "", "\n");
 
-    z = {std::move(y)};
+    z = { std::move(y) };
     CPP2_UFCS(print, std::move(z), "   mv-assign     ", " <- ");
     CPP2_UFCS(print, std::move(y), "", "\n");
 }

regression-tests/test-results/pure2-types-smf-and-that-4-provide-cpassign-and-mvassign.cpp

@@ -147,7 +147,7 @@ auto main() -> int{
     CPP2_UFCS(print, z, "   cp-assign     ", " <- ");
     CPP2_UFCS(print, y, "", "\n");
 
-    z = {std::move(y)};
+    z = { std::move(y) };
     CPP2_UFCS(print, std::move(z), "   mv-assign     ", " <- ");
     CPP2_UFCS(print, std::move(y), "", "\n");
 }

regression-tests/test-results/pure2-types-smf-and-that-5-provide-nothing-but-general-case.cpp

@@ -153,7 +153,7 @@ auto main() -> int{
     CPP2_UFCS(print, z, "   cp-assign     ", " <- ");
     CPP2_UFCS(print, y, "", "\n");
 
-    z = {std::move(y)};
+    z = { std::move(y) };
     CPP2_UFCS(print, std::move(z), "   mv-assign     ", " <- ");
     CPP2_UFCS(print, std::move(y), "", "\n");
 }

source/cppfront.cpp

@@ -1003,7 +1003,6 @@ class cppfront
     bool violates_bounds_safety         = false;
     bool violates_initialization_safety = false;
     bool suppress_move_from_last_use    = false;
-    bool expression_list_is_braced_init = false;
 
     declaration_node const*   generating_assignment_from  = {};
     declaration_node const*   generating_move_from        = {};
@@ -3501,15 +3500,22 @@ class cppfront
                 printer.print_cpp2(" ", n.position());
                 emit(*x.op);
                 printer.print_cpp2(" ", n.position());
+                //  When assigning a single expression-list, we can
+                //  take over direct control of emitting it without needing to
+                //  go through the whole grammar, and surround it with braces
                 if (
                     x.op->type() == lexeme::Assignment
                     && x.expr->is_expression_list()
-                )
+                    )
                 {
-                    expression_list_is_braced_init = true;
+                    printer.print_cpp2( "{ ", n.position() );
+                    emit(*x.expr->get_expression_list(), false);
+                    printer.print_cpp2( " }", n.position() );
+                }
+                //  Otherwise, just emit the general expression as usual
+                else {
+                    emit(*x.expr);
                 }
-                emit(*x.expr);
-                assert (expression_list_is_braced_init == false);
             }
         }
     }
@@ -3540,13 +3546,9 @@ class cppfront
             && !n.inside_initializer
             && parens_ok
             ;
-        auto add_braces = std::exchange(expression_list_is_braced_init, false);
         if (add_parens) {
             printer.print_cpp2( *n.open_paren, n.position());
         }
-        else if (add_braces) {
-            printer.print_cpp2( "{", n.position());
-        }
 
         auto first = true;
         for (auto const& x : n.expressions) {
@@ -3596,9 +3598,6 @@ class cppfront
         if (add_parens) {
             printer.print_cpp2( *n.close_paren, n.position());
         }
-        else if (add_braces) {
-            printer.print_cpp2( "}", n.position());
-        }
         //  We want to consume only one of these
         consumed_expression_list_parens();
     }