Changeset 68f9c43 for src/ResolvExpr/Resolver.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 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/ResolvExpr/Resolver.cc (modified) (9 diffs)

src/ResolvExpr/Resolver.cc

@@ -138 +138 @@
                                         castExpr->arg = nullptr;
                                         std::swap( expr->env, castExpr->env );
-                                        delete castExpr;
                                 }
                         }
@@ -198 +197 @@
                         findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast );
                         finishExpr( choice.expr, choice.env, untyped->env );
-                        delete untyped;
                         untyped = choice.expr;
                         choice.expr = nullptr;
@@ -244 +242 @@
                 Expression * newExpr = resolveInVoidContext( untyped, indexer, env );
                 finishExpr( newExpr, env, untyped->env );
-                delete untyped;
                 untyped = newExpr;
         }
@@ -418 +415 @@
                         caseStmt->condition = castExpr->arg;
                         castExpr->arg = nullptr;
-                        delete castExpr;
                 }
         }
@@ -700 +696 @@
                 std::swap( initExpr->env, newExpr->env );
                 std::swap( initExpr->inferParams, newExpr->inferParams ) ;
-                delete initExpr;
 
                 // get the actual object's type (may not exactly match what comes back from the resolver due to conversions)
@@ -718 +713 @@
                                                         ce->set_arg( nullptr );
                                                         std::swap( ce->env, newExpr->env );
-                                                        delete ce;
                                                 }
                                         }
@@ -769 +763 @@
                 // could not find valid constructor, or found an intrinsic constructor
                 // fall back on C-style initializer
-                delete ctorInit->get_ctor();
-                ctorInit->set_ctor( NULL );
-                delete ctorInit->get_dtor();
-                ctorInit->set_dtor( NULL );
+                ctorInit->set_ctor( nullptr );
+                ctorInit->set_dtor( nullptr );
                 maybeAccept( ctorInit->get_init(), *visitor );
         }
@@ -798 +790 @@
 
                 // found a constructor - can get rid of C-style initializer
-                delete ctorInit->init;
                 ctorInit->init = nullptr;
 
@@ -805 +796 @@
                 // to clean up generated code.
                 if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
-                        delete ctorInit->ctor;
                         ctorInit->ctor = nullptr;
                 }
 
                 if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
-                        delete ctorInit->dtor;
                         ctorInit->dtor = nullptr;
                 }