Changes in src/Tuples/Explode.cc [8d7bef2:0b5d871]

File:

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

src/Tuples/Explode.cc

@@ -15 +15 @@
 
 #include "Explode.h"
-#include <list>                  // for list
-
-#include "SynTree/Mutator.h"     // for Mutator
-#include "Common/PassVisitor.h"  // for PassVisitor
+#include "SynTree/Mutator.h"
+#include "Common/PassVisitor.h"
 
 namespace Tuples {
@@ -70 +68 @@
                                 // should now be a tuple of references rather than a reference to a tuple.
                                 // Still, this code is a bit awkward, and could use some improvement.
-                                UniqueExpr * newUniqueExpr = new UniqueExpr{ applyCast( uniqueExpr->get_expr() ), uniqueExpr->get_id() };
+                                UniqueExpr * newUniqueExpr = new UniqueExpr( applyCast( uniqueExpr->get_expr() ), uniqueExpr->get_id() );
+                                delete uniqueExpr;
                                 if ( castAdded ) {
                                         // if a cast was added by applyCast, then unique expr now has one more layer of reference
@@ -87 +86 @@
                                 // field is consistent with the type of the tuple expr, since the field
                                 // may have changed from type T to T&.
-                                return new TupleIndexExpr( tupleExpr->get_tuple(), tupleExpr->get_index() );
+                                Expression * expr = tupleExpr->get_tuple();
+                                tupleExpr->set_tuple( nullptr );
+                                TupleIndexExpr * ret = new TupleIndexExpr( expr, tupleExpr->get_index() );
+                                delete tupleExpr;
+                                return ret;
                         }
                 };