Changes in src/InitTweak/FixInit.cc [08da53d:680620d]

File:

• src/InitTweak/FixInit.cc (modified) (6 diffs)

src/InitTweak/FixInit.cc

@@ -367 +367 @@
                         ImplicitCtorDtorStmt * stmt = genCtorDtor( fname, var, cpArg );
                         ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
-                        Expression * resolved = exprStmt->expr;
-                        exprStmt->expr = nullptr; // take ownership of expr
+                        Expression * untyped = exprStmt->get_expr();
 
                         // resolve copy constructor
                         // should only be one alternative for copy ctor and dtor expressions, since all arguments are fixed
                         // (VariableExpr and already resolved expression)
-                        CP_CTOR_PRINT( std::cerr << "ResolvingCtorDtor " << resolved << std::endl; )
-                        ResolvExpr::findVoidExpression( resolved, indexer );
+                        CP_CTOR_PRINT( std::cerr << "ResolvingCtorDtor " << untyped << std::endl; )
+                        Expression * resolved = ResolvExpr::findVoidExpression( untyped, indexer );
                         assert( resolved );
                         if ( resolved->get_env() ) {
@@ -382 +381 @@
                                 resolved->set_env( nullptr );
                         } // if
+
                         delete stmt;
                         return resolved;
@@ -1112 +1112 @@
                 }
 
-                DeclarationWithType * MutatingResolver::mutate( ObjectDecl * objectDecl ) {
+                DeclarationWithType * MutatingResolver::mutate( ObjectDecl *objectDecl ) {
                         // add object to the indexer assumes that there will be no name collisions
                         // in generated code. If this changes, add mutate methods for entities with
@@ -1120 +1120 @@
                 }
 
-                Expression * MutatingResolver::mutate( UntypedExpr * untypedExpr ) {
-                        Expression * newExpr = untypedExpr;
-                        ResolvExpr::findVoidExpression( newExpr, indexer );
-                        return newExpr;
+                Expression* MutatingResolver::mutate( UntypedExpr *untypedExpr ) {
+                        return strict_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
                 }
 
@@ -1148 +1146 @@
 
                         // resolve assignment and dispose of new env
-                        ResolvExpr::findVoidExpression( assign, indexer );
-                        delete assign->env;
-                        assign->env = nullptr;
+                        Expression * resolvedAssign = ResolvExpr::findVoidExpression( assign, indexer );
+                        delete resolvedAssign->env;
+                        resolvedAssign->env = nullptr;
+                        delete assign;
 
                         // for constructor expr:
@@ -1159 +1158 @@
                         //   T & tmp;
                         //   &tmp = &x, ?{}(tmp), tmp
-                        CommaExpr * commaExpr = new CommaExpr( assign, new CommaExpr( callExpr, new VariableExpr( tmp ) ) );
+                        CommaExpr * commaExpr = new CommaExpr( resolvedAssign, new CommaExpr( callExpr, new VariableExpr( tmp ) ) );
                         commaExpr->set_env( env );
                         return commaExpr;