Changeset 2a7b3ca for src/Common

Timestamp:

Jun 26, 2017, 4:13:36 PM (8 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:

579263a, 949934e

Parents:

d24d4e1

Message:

convert InstantiateGeneric to PassVisitor, add missing mutate and accept calls to PassVisitor, add missing ValueGuardPtrs to PassVisitor::handleStatementList

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (3 diffs)
• PassVisitor.proto.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -12 +12 @@
 #include "SynTree/Expression.h"
 #include "SynTree/Constant.h"
+#include "SynTree/TypeSubstitution.h"
 
 #include "PassVisitor.proto.h"

src/Common/PassVisitor.impl.h

@@ -105 +105 @@
         SemanticError errors;
 
+        // don't want statements from outer CompoundStmts to be added to this CompoundStmt
+        ValueGuardPtr< StmtList_t > oldBeforeStmts( get_beforeStmts() );
+        ValueGuardPtr< StmtList_t > oldAfterStmts ( get_afterStmts () );
+        ValueGuardPtr< DeclList_t > oldBeforeDecls( get_beforeDecls() );
+        ValueGuardPtr< DeclList_t > oldAfterDecls ( get_afterDecls () );
+
         StmtList_t* beforeStmts = get_beforeStmts();
         StmtList_t* afterStmts  = get_afterStmts();
@@ -565 +571 @@
         VISIT_START( node );
 
+        // maybeAccept( node->get_env(), *this );
+        maybeAccept( node->get_result(), *this );
+
         for ( auto expr : node->get_args() ) {
                 visitExpression( expr );
@@ -575 +584 @@
 Expression * PassVisitor< pass_type >::mutate( UntypedExpr * node ) {
         MUTATE_START( node );
+
+        node->set_env( maybeMutate( node->get_env(), *this ) );
+        node->set_result( maybeMutate( node->get_result(), *this ) );
 
         for ( auto& expr : node->get_args() ) {

src/Common/PassVisitor.proto.h

@@ -56 +56 @@
 // Deep magic (a.k.a template meta programming) to make the templated visitor work
 // Basically the goal is to make 2 previsit_impl
-// 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of 
+// 1 - Use when a pass implements a valid previsit. This uses overloading which means the any overload of
 //     'pass.previsit( node )' that compiles will be used for that node for that type
 //     This requires that this option only compile for passes that actually define an appropriate visit.