Changeset 2449aef

Timestamp:

Dec 1, 2017, 10:37:19 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

82f3226

Parents:

027c496

Message:

Convert EnvRemover? to PassVisitor?

File:

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

src/Tuples/TupleAssignment.cc ¶

@@ -23 +23 @@
 
 #include "CodeGen/OperatorTable.h"
+#include "Common/PassVisitor.h"
 #include "Common/UniqueName.h"             // for UniqueName
 #include "Common/utility.h"                // for zipWith
@@ -277 +278 @@
         // xxx - maybe this should happen in alternative finder for every StmtExpr?
         // xxx - it's possible that these environments could contain some useful information. Maybe the right thing to do is aggregate the environments and pass the aggregate back to be added into the compositeEnv
-        struct EnvRemover : public Visitor {
-                virtual void visit( ExprStmt * stmt ) {
-                        delete stmt->get_expr()->get_env();
-                        stmt->get_expr()->set_env( nullptr );
-                        Visitor::visit( stmt );
+        struct EnvRemover {
+                void previsit( ExprStmt * stmt ) {
+                        delete stmt->expr->env;
+                        stmt->expr->env = nullptr;
                 }
         };
@@ -293 +293 @@
                         ret->set_init( ctorInit );
                         ResolvExpr::resolveCtorInit( ctorInit, spotter.currentFinder.get_indexer() ); // resolve ctor/dtors for the new object
-                        EnvRemover rm; // remove environments from subexpressions of StmtExprs
+                        PassVisitor<EnvRemover> rm; // remove environments from subexpressions of StmtExprs
                         ctorInit->accept( rm );
                 }