Changeset a2a85658

Timestamp:

Jun 18, 2019, 2:28:36 PM (6 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4487667, 73edfe9

Parents:

c8e4d2f8

Message:

Fixed conversion of tuple assignments to reuse the common part correctly. For example, in [x,y] = foo().[a,b], foo should be called once. Convert-convert before resolve was causing foo to be called twice, because the unique ID of a UniqueExpr? wasn't preserved on AST conversion. Symptom was failing test tuple/tupleMember (given convert-convert before resolve).

File:

• src/AST/Convert.cpp (modified) (2 diffs)

src/AST/Convert.cpp

@@ -993 +993 @@
         const ast::Expr * visit( const ast::UniqueExpr * node ) override final {
                 auto rslt = new UniqueExpr(
-                        get<Expression>().accept1(node->expr)
+                        get<Expression>().accept1(node->expr),
+                        node->id
                 );
 
@@ -2367 +2368 @@
                 auto rslt = new ast::UniqueExpr(
                         old->location,
-                        GET_ACCEPT_1(expr, Expr)
+                        GET_ACCEPT_1(expr, Expr),
+                        old->get_id()
                 );
                 rslt->object = GET_ACCEPT_1(object, ObjectDecl);