Changeset 68f9c43 for src/Tuples/Explode.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

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

src/Tuples/Explode.cc

@@ -70 +70 @@
                                 // 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() );
-                                delete uniqueExpr;
+                                UniqueExpr * newUniqueExpr = new UniqueExpr{ applyCast( uniqueExpr->get_expr() ), uniqueExpr->get_id() };
                                 if ( castAdded ) {
                                         // if a cast was added by applyCast, then unique expr now has one more layer of reference
@@ -88 +87 @@
                                 // field is consistent with the type of the tuple expr, since the field
                                 // may have changed from type T to T&.
-                                Expression * expr = tupleExpr->get_tuple();
-                                tupleExpr->set_tuple( nullptr );
-                                TupleIndexExpr * ret = new TupleIndexExpr( expr, tupleExpr->get_index() );
-                                delete tupleExpr;
-                                return ret;
+                                return new TupleIndexExpr{ tupleExpr->get_tuple(), tupleExpr->get_index() };
                         }
                 };