Changeset 68f9c43 for src/Tuples

Timestamp:

Mar 16, 2018, 5:15:02 PM (8 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

Location:

src/Tuples

Files:

• Explode.cc (modified) (2 diffs)
• Explode.h (modified) (3 diffs)
• TupleExpansion.cc (modified) (8 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() };
                         }
                 };

src/Tuples/Explode.h

@@ -27 +27 @@
 namespace SymTab {
 class Indexer;
-}  // namespace SymTab
+}  // namespace SymTabf
 
 namespace Tuples {
@@ -67 +67 @@
                                 for ( ResolvExpr::Alternative & alt : alts ) {
                                         // distribute reference cast over all components
-                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
+                                        append( std::forward<Output>(out), distributeReference( alt.expr ),
                                                 alt.env, alt.cost, alt.cvtCost );
                                 }
@@ -96 +96 @@
                                         TupleIndexExpr * idx = new TupleIndexExpr( arg->clone(), i );
                                         explodeUnique( idx, alt, indexer, std::forward<Output>(out), isTupleAssign );
-                                        delete idx;
                                 }
-                                delete arg;
                         }
                 } else {

src/Tuples/TupleExpansion.cc

@@ -45 +45 @@
 
                         std::map< int, Expression * > decls; // not vector, because order added may not be increasing order
-
-                        ~UniqueExprExpander() {
-                                for ( std::pair<const int, Expression *> & p : decls ) {
-                                        delete p.second;
-                                }
-                        }
                 };
 
@@ -111 +105 @@
                                 UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->member, inner );
                                 inner->location = newMemberExpr->location = loc;
-                                memberExpr->member = nullptr;
-                                memberExpr->aggregate = nullptr;
-                                delete memberExpr;
                                 return newMemberExpr->acceptMutator( expander );
                         } else {
@@ -135 +126 @@
                                 expr->location = memberExpr->location;
                         }
-                        delete aggr;
                         tupleExpr->location = memberExpr->location;
                         return tupleExpr;
@@ -181 +171 @@
                         decls[id] = condExpr;
                 }
-                delete unqExpr;
                 return decls[id]->clone();
         }
@@ -191 +180 @@
                 ret->set_env( assnExpr->get_env() );
                 assnExpr->set_env( nullptr );
-                delete assnExpr;
                 return ret;
         }
@@ -222 +210 @@
                         newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
                 }
-                delete tupleType;
                 return newType;
         }
@@ -233 +220 @@
                 TypeSubstitution * env = tupleExpr->get_env();
                 tupleExpr->set_env( nullptr );
-                delete tupleExpr;
 
                 StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
@@ -275 +261 @@
                 TypeSubstitution * env = tupleExpr->get_env();
 
-                // remove data from shell and delete it
-                tupleExpr->set_result( nullptr );
-                tupleExpr->get_exprs().clear();
+                // remove data from shell
                 tupleExpr->set_env( nullptr );
-                delete tupleExpr;
 
                 return replaceTupleExpr( result, exprs, env );