Changeset bd06384 for src/ResolvExpr

Timestamp:

Mar 22, 2018, 4:49:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

dbc2c2c

Parents:

7e4b44db

Message:

Add static roots to GC; fix some static GC_Objects

File:

• src/ResolvExpr/Resolver.cc (modified) (1 diff)

src/ResolvExpr/Resolver.cc

@@ -219 +219 @@
                 assertf( expr, "expected a non-null expression." );
 
-                static CastExpr untyped( nullptr ); // cast to void
+                auto untyped = new CastExpr{ expr }; // cast to void
 
                 // set up and resolve expression cast to void
-                untyped.arg = expr;
                 Alternative choice;
-                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, true );
+                findUnfinishedKindExpression( untyped, choice, indexer, "", standardAlternativeFilter, true );
                 CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
                 env = std::move( choice.env );
 
                 // clean up resolved expression
-                Expression * ret = castExpr->arg;
-                castExpr->arg = nullptr;
-
-                // unlink the arg so that it isn't deleted twice at the end of the program
-                untyped.arg = nullptr;
-                return ret;
+                return castExpr->arg;
         }