Rebase and update of JohelEGP's braced-init-list branch

regression-tests/pure2-bugfix-for-nested-lists.cpp2

@@ -0,0 +1,32 @@
+point: @value type = {
+    public x: int = 0;
+    public y: int = 0;
+    operator=: (implicit out this, x_: int, y_: int) = {
+        x = x_;
+        y = y_;
+    }
+}
+
+check: (copy p: point) -> point = p;
+
+main: () = {
+    assert(check((17, 29)).x == 17);
+    assert(check((17, 29)).y == 29);
+
+    board: std::array<std::array<u8, 3>, 3> = ((
+                                            ('O', 'X', 'O'),
+                                            (' ', ('X'), 'X'),
+                                            ('X', 'O', 'O')
+    ));
+    assert(board[0] == :std::array<u8, 3> = ('O', 'X', 'O'));
+    assert(board[1] == :std::array<u8, 3> = (' ', 'X', 'X'));
+    assert(board[2] == :std::array<u8, 3> = ('X', 'O', 'O'));
+
+    // Still parentheses (for now?)
+    assert((:std::vector = (17, 29)).size() == 2);
+}
+
+issue_1283: () = {
+  f := :() = { };
+  _ = :() = (f&$*)();
+}

regression-tests/pure2-hashable.cpp2

@@ -3,7 +3,7 @@ base: @struct @hashable type = {
 }
 
 mystruct: @struct @hashable type = {
-    this: base = (1);
+    this: base = 1;
     i: i32;
     j: std::string;
     k: u64;
@@ -12,4 +12,4 @@ mystruct: @struct @hashable type = {
 main: () = {
     x: mystruct = (2, "three", 4u);
     std::cout << x.hash();
-}
+}

regression-tests/test-results/mixed-default-arguments.cpp

@@ -33,8 +33,8 @@ auto cxx2(cpp2::impl::in<int> x, cpp2::impl::in<std::string> y) -> void{
 #line 9 "mixed-default-arguments.cpp2"
 auto main() -> int{
  cxx(1, "test");
- cxx({}, {});
+ cxx({  }, {  });
  cxx2(1, "test");
- cxx2({}, {});
+ cxx2({  }, {  });
 }
 

regression-tests/test-results/pure2-bugfix-for-nested-lists.cpp

@@ -0,0 +1,95 @@
+
+#define CPP2_IMPORT_STD          Yes
+
+//=== Cpp2 type declarations ====================================================
+
+
+#include "cpp2util.h"
+
+#line 1 "pure2-bugfix-for-nested-lists.cpp2"
+class point;
+#line 2 "pure2-bugfix-for-nested-lists.cpp2"
+
+
+//=== Cpp2 type definitions and function declarations ===========================
+
+#line 1 "pure2-bugfix-for-nested-lists.cpp2"
+class point {
+#line 2 "pure2-bugfix-for-nested-lists.cpp2"
+    public: int x {0}; 
+    public: int y {0}; 
+    public: point(cpp2::impl::in<int> x_, cpp2::impl::in<int> y_);
+    public: [[nodiscard]] auto operator<=>(point const& that) const& -> std::strong_ordering = default;
+public: point(point const& that);
+
+public: auto operator=(point const& that) -> point& ;
+public: point(point&& that) noexcept;
+public: auto operator=(point&& that) noexcept -> point& ;
+public: explicit point();
+
+#line 8 "pure2-bugfix-for-nested-lists.cpp2"
+};
+
+[[nodiscard]] auto check(point p) -> point;
+
+auto main() -> int;
+
+#line 29 "pure2-bugfix-for-nested-lists.cpp2"
+auto issue_1283() -> void;
+
+//=== Cpp2 function definitions =================================================
+
+#line 1 "pure2-bugfix-for-nested-lists.cpp2"
+
+#line 4 "pure2-bugfix-for-nested-lists.cpp2"
+    point::point(cpp2::impl::in<int> x_, cpp2::impl::in<int> y_)
+        : x{ x_ }
+        , y{ y_ }{
+
+#line 7 "pure2-bugfix-for-nested-lists.cpp2"
+    }
+
+
+    point::point(point const& that)
+                                : x{ that.x }
+                                , y{ that.y }{}
+
+auto point::operator=(point const& that) -> point& {
+                                x = that.x;
+                                y = that.y;
+                                return *this;}
+point::point(point&& that) noexcept
+                                : x{ std::move(that).x }
+                                , y{ std::move(that).y }{}
+auto point::operator=(point&& that) noexcept -> point& {
+                                x = std::move(that).x;
+                                y = std::move(that).y;
+                                return *this;}
+point::point(){}
+#line 10 "pure2-bugfix-for-nested-lists.cpp2"
+[[nodiscard]] auto check(point p) -> point { return cpp2::move(p);  }
+
+#line 12 "pure2-bugfix-for-nested-lists.cpp2"
+auto main() -> int{
+    if (cpp2::cpp2_default.is_active() && !(check({ 17, 29 }).x == 17) ) { cpp2::cpp2_default.report_violation(""); }
+    if (cpp2::cpp2_default.is_active() && !(check({ 17, 29 }).y == 29) ) { cpp2::cpp2_default.report_violation(""); }
+
+    std::array<std::array<cpp2::u8,3>,3> board {{ { 
+                                            'O', 'X', 'O' }, { 
+                                            ' ', { 'X' }, 'X' }, { 
+                                            'X', 'O', 'O' } }}; 
+
+    if (cpp2::cpp2_default.is_active() && !(CPP2_ASSERT_IN_BOUNDS_LITERAL(board, 0) == std::array<cpp2::u8,3>{'O', 'X', 'O'}) ) { cpp2::cpp2_default.report_violation(""); }
+    if (cpp2::cpp2_default.is_active() && !(CPP2_ASSERT_IN_BOUNDS_LITERAL(board, 1) == std::array<cpp2::u8,3>{' ', 'X', 'X'}) ) { cpp2::cpp2_default.report_violation(""); }
+    if (cpp2::cpp2_default.is_active() && !(CPP2_ASSERT_IN_BOUNDS_LITERAL(cpp2::move(board), 2) == std::array<cpp2::u8,3>{'X', 'O', 'O'}) ) { cpp2::cpp2_default.report_violation(""); }
+
+    // Still parentheses (for now?)
+    if (cpp2::cpp2_default.is_active() && !(CPP2_UFCS(size)((std::vector{17, 29})) == 2) ) { cpp2::cpp2_default.report_violation(""); }
+}
+
+#line 29 "pure2-bugfix-for-nested-lists.cpp2"
+auto issue_1283() -> void{
+  auto f {[]() -> void{}}; 
+  static_cast<void>([_0 = (&f)]() mutable -> decltype(auto) { return (*cpp2::impl::assert_not_null(_0))();  });
+}
+

regression-tests/test-results/pure2-bugfix-for-nested-lists.cpp2.output

@@ -0,0 +1,2 @@
+pure2-bugfix-for-nested-lists.cpp2... ok (all Cpp2, passes safety checks)
+

regression-tests/test-results/pure2-hashable.cpp

@@ -66,7 +66,7 @@ return ret;
 
 mystruct::mystruct(auto&& i_, auto&& j_, auto&& k_)
 requires (std::is_convertible_v<CPP2_TYPEOF(i_), std::add_const_t<cpp2::i32>&> && std::is_convertible_v<CPP2_TYPEOF(j_), std::add_const_t<std::string>&> && std::is_convertible_v<CPP2_TYPEOF(k_), std::add_const_t<cpp2::u64>&>) 
-                                                                                                       : base{ (1) }
+                                                                                                       : base{ 1 }
                                                                                                        , i{ CPP2_FORWARD(i_) }
                                                                                                        , j{ CPP2_FORWARD(j_) }
                                                                                                        , k{ CPP2_FORWARD(k_) }{}

source/parse.h

@@ -784,7 +784,6 @@ struct expression_list_node
     token const* open_paren  = {};
     token const* close_paren = {};
     bool inside_initializer  = false;
-    bool default_initializer = false;
 
     struct term {
         passing_style                    pass = {};
@@ -6514,7 +6513,6 @@ class parser
     };
     mutable std::vector<function_body_extent> function_body_extents;
     mutable bool                              is_function_body_extents_sorted = false;
-    bool                                      is_inside_call_expr = false;
 
 public:
     auto is_within_function_body(source_position p) const
@@ -6901,8 +6899,6 @@ class parser
                 expr_list->inside_initializer = false;
             }
             n->expression_list_is_fold_expression = expr_list->is_fold_expression();
-            expr_list->default_initializer =
-                is_inside_call_expr && std::empty(expr_list->expressions);
 
             n->expr = std::move(expr_list);
             return n;
@@ -7058,9 +7054,7 @@ class parser
                 //  Next should be an expression-list followed by a ')'
                 //  If not, then this wasn't a call expression so backtrack to
                 //  the '(' which will be part of the next grammar production
-		        is_inside_call_expr = true;
-                term.expr_list = expression_list(term.op, lexeme::RightParen);
-		        is_inside_call_expr = false;
+                term.expr_list = expression_list(term.op, lexeme::RightParen, true);
 
                 if (
                     term.expr_list
@@ -7604,8 +7598,28 @@ class parser
             return n;
         }
 
+        auto add_expression = [&](expression_list_node::term t) {
+            std::function<void(expression_list_node::term&)> mark_nested_inside_initializer{
+                [&](expression_list_node::term& u) {
+                    if (
+                        inside_initializer
+                        && u.expr->is_expression_list()
+                        )
+                    {
+                        auto l = const_cast<expression_list_node*>(u.expr->get_expression_list());
+                        l->inside_initializer = true;
+                        for (auto& e : l->expressions) {
+                            mark_nested_inside_initializer(e);
+                        }
+                    }
+                }
+            };
+            mark_nested_inside_initializer(t);
+            n->expressions.push_back(std::move(t));
+        };
+
         //  Otherwise remember the first expression
-        n->expressions.push_back( { pass, std::move(x) } );
+        add_expression( { pass, std::move(x) } );
         //  and see if there are more...
         while (curr().type() == lexeme::Comma) {
             next();
@@ -7621,7 +7635,7 @@ class parser
                 error("invalid text in expression list", true, {}, true);
                 return {};
             }
-            n->expressions.push_back( { pass, std::move(expr) } );
+            add_expression( { pass, std::move(expr) } );
         }
 
         return n;

source/to_cpp1.h

@@ -4191,13 +4191,6 @@ class cppfront
             !(n.inside_initializer && current_declarations.back()->initializer->position() != n.open_paren->position())
             ;
 
-        if (n.default_initializer) {
-            if (add_parens) {
-                printer.print_cpp2("{}", n.position());
-            }
-            return;
-        }
-
         if (add_parens) {
             printer.print_cpp2( *n.open_paren, n.position());
         }
@@ -4235,7 +4228,22 @@ class cppfront
 
             assert(x.expr);
             current_args.push_back( {x.pass} );
-            emit(*x.expr);
+            //  In a nested expression-list in an initializer, we can
+            //  take over direct control of emitting it without needing to
+            //  go through the whole grammar, and surround it with braces
+            if (
+                n.inside_initializer
+                && x.expr->is_expression_list()
+                )
+            {
+                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);
+            }
             current_args.pop_back();
 
             if (is_out) {