Changeset e67a82d for src/Tuples/Explode.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicts

File:

• src/Tuples/Explode.cc (modified) (4 diffs)

src/Tuples/Explode.cc

@@ -129 +129 @@
                         for ( const ast::Expr * expr : tupleExpr->exprs ) {
                                 exprs.emplace_back( applyCast( expr, false ) );
-                                //exprs.emplace_back( ast::ptr< ast::Expr >( applyCast( expr, false ) ) );
                         }
                         if ( first ) {
@@ -148 +147 @@
         }
 
-        const ast::Expr * postmutate( const ast::UniqueExpr * node ) {
+        const ast::Expr * postvisit( const ast::UniqueExpr * node ) {
                 // move cast into unique expr so that the unique expr has type T& rather than
                 // type T. In particular, this transformation helps with generating the
@@ -162 +161 @@
                         castAdded = false;
                         const ast::Type * newType = getReferenceBase( newNode->result );
-                        return new ast::CastExpr{ newNode->location, node, newType };
+                        return new ast::CastExpr{ newNode->location, newNode, newType };
                 }
                 return newNode;
         }
 
-        const ast::Expr * postmutate( const ast::TupleIndexExpr * tupleExpr ) {
+        const ast::Expr * postvisit( const ast::TupleIndexExpr * tupleExpr ) {
                 // tuple index expr needs to be rebuilt to ensure that the type of the
                 // field is consistent with the type of the tuple expr, since the field
@@ -180 +179 @@
         ast::Pass<CastExploderCore> exploder;
         expr = expr->accept( exploder );
-        if ( ! exploder.pass.foundUniqueExpr ) {
+        if ( ! exploder.core.foundUniqueExpr ) {
                 expr = new ast::CastExpr{ expr, new ast::ReferenceType{ expr->result } };
         }