fix(to_cpp1): support initializing assignment from expression list in…

… `operator=`
hsutter · Nov 9, 2023 · eb7cd63 · eb7cd63
1 parent 61550a5
commit eb7cd63
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 3 deletions.
diff --git a/regression-tests/pure2-bugfix-for-assign-expression-list.cpp2 b/regression-tests/pure2-bugfix-for-assign-expression-list.cpp2
@@ -1,5 +1,13 @@
+vec: type == std::vector<int>;
+
+my_vec: type = {
+  v: vec = ();
+  operator=: (out this, _: std::integral_constant<int, 0>) = v = ();
+  operator=: (out this, _: std::integral_constant<int, 1>) = v = (1);
+  operator=: (out this, _: std::integral_constant<int, 2>) = v = (2, 3);
+}
+
 main: () = {
-  vec: type == std::vector<int>;
   v: vec              = (0);
   v                   = ();
   assert( v == :vec = () );

diff --git a/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp b/regression-tests/test-results/pure2-bugfix-for-assign-expression-list.cpp
@@ -7,16 +7,73 @@
 #include "cpp2util.h"
 
 
+#line 3 "pure2-bugfix-for-assign-expression-list.cpp2"
+class my_vec;
+
 
 //=== Cpp2 type definitions and function declarations ===========================
 
-auto main() -> int;
+using vec = std::vector<int>;
+
+class my_vec {
+  private: vec v {}; 
+  public: explicit my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,0>> param2);
 
+#line 5 "pure2-bugfix-for-assign-expression-list.cpp2"
+  public: auto operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,0>> param2) -> my_vec& ;
+  public: explicit my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,1>> param2);
+
+#line 6 "pure2-bugfix-for-assign-expression-list.cpp2"
+  public: auto operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,1>> param2) -> my_vec& ;
+  public: explicit my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,2>> param2);
+#line 7 "pure2-bugfix-for-assign-expression-list.cpp2"
+  public: auto operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,2>> param2) -> my_vec& ;
+
+  public: my_vec(my_vec const&) = delete; /* No 'that' constructor, suppress copy */
+  public: auto operator=(my_vec const&) -> void = delete;
+#line 8 "pure2-bugfix-for-assign-expression-list.cpp2"
+};
+
+auto main() -> int;
+
 
 //=== Cpp2 function definitions =================================================
 
+
+#line 5 "pure2-bugfix-for-assign-expression-list.cpp2"
+  my_vec::my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,0>> param2)
+                                                             : v{  }
+#line 5 "pure2-bugfix-for-assign-expression-list.cpp2"
+   {  }
+#line 5 "pure2-bugfix-for-assign-expression-list.cpp2"
+  auto my_vec::operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,0>> param2) -> my_vec&  { 
+                                                             v = {  };
+                                                             return *this;
+#line 5 "pure2-bugfix-for-assign-expression-list.cpp2"
+   }
+  my_vec::my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,1>> param2)
+                                                             : v{ 1 }
+#line 6 "pure2-bugfix-for-assign-expression-list.cpp2"
+   {  }
+#line 6 "pure2-bugfix-for-assign-expression-list.cpp2"
+  auto my_vec::operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,1>> param2) -> my_vec&  { 
+                                                             v = { 1 };
+                                                             return *this;
+#line 6 "pure2-bugfix-for-assign-expression-list.cpp2"
+   }
+  my_vec::my_vec([[maybe_unused]] cpp2::in<std::integral_constant<int,2>> param2)
+                                                             : v{ 2, 3 }
+#line 7 "pure2-bugfix-for-assign-expression-list.cpp2"
+   {  }
+#line 7 "pure2-bugfix-for-assign-expression-list.cpp2"
+  auto my_vec::operator=([[maybe_unused]] cpp2::in<std::integral_constant<int,2>> param2) -> my_vec&  { 
+                                                             v = { 2, 3 };
+                                                             return *this;
+#line 7 "pure2-bugfix-for-assign-expression-list.cpp2"
+   }
+
+#line 10 "pure2-bugfix-for-assign-expression-list.cpp2"
 auto main() -> int{
-  using vec = std::vector<int>;
   vec v {0}; 
   v                   = {  };
   cpp2::Default.expects(v == vec{}, "");

diff --git a/source/to_cpp1.h b/source/to_cpp1.h
@@ -4739,6 +4739,14 @@ class cppfront
                         if (found_explicit_init)
                         {
                             initializer = rhs;
+                            if (
+                                is_assignment
+                                && std::get<statement_node::expression>((*statement)->statement)
+                                       ->expr->expr->terms[0].expr->is_expression_list()
+                                )
+                            {
+                                initializer = "{ " + rhs + " }";
+                            }
 
                             //  We've used this statement, so note it
                             //  and move 'statement' forward