Changes in src/Tuples/Explode.h [75308bcc:490ff5c3]

File:

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

src/Tuples/Explode.h

@@ -27 +27 @@
 namespace SymTab {
 class Indexer;
-}  // namespace SymTabf
+}  // namespace SymTab
 
 namespace Tuples {
@@ -67 +67 @@
                                 for ( ResolvExpr::Alternative & alt : alts ) {
                                         // distribute reference cast over all components
-                                        append( std::forward<Output>(out), distributeReference( alt.expr ),
+                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
                                                 alt.env, alt.cost, alt.cvtCost );
                                 }
@@ -84 +84 @@
                                 // tuple type, but not tuple expr - recursively index into its components.
                                 // if expr type is reference, convert to value type
-                                Expression * arg = expr;
+                                Expression * arg = expr->clone();
                                 if ( Tuples::maybeImpureIgnoreUnique( arg ) ) {
                                         // expressions which may contain side effects require a single unique instance of the expression.
@@ -94 +94 @@
                                 }
                                 for ( unsigned int i = 0; i < tupleType->size(); i++ ) {
-                                        TupleIndexExpr * idx = new TupleIndexExpr( arg, i );
+                                        TupleIndexExpr * idx = new TupleIndexExpr( arg->clone(), i );
                                         explodeUnique( idx, alt, indexer, std::forward<Output>(out), isTupleAssign );
+                                        delete idx;
                                 }
+                                delete arg;
                         }
                 } else {
-                        // atomic (non-tuple) type - output the expression in a new alternative
-                        append( std::forward<Output>(out), expr, alt.env, alt.cost, alt.cvtCost );
+                        // atomic (non-tuple) type - output a clone of the expression in a new alternative
+                        append( std::forward<Output>(out), expr->clone(), alt.env, alt.cost, alt.cvtCost );
                 }
         }