Changes in src/Common/PassVisitor.impl.h [6ca154b:62423350]

File:

• src/Common/PassVisitor.impl.h (modified) (9 diffs)

src/Common/PassVisitor.impl.h

@@ -3 +3 @@
 #define VISIT_START( node )                     \
         __attribute__((unused))                   \
-        const auto & guard = init_guard();        \
+        guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \
@@ -15 +15 @@
 #define MUTATE_START( node )                    \
         __attribute__((unused))                   \
-        const auto & guard = init_guard();        \
+        guard_value_impl guard( at_cleanup_impl(pass, 0) );       \
         bool visit_children = true;               \
         set_visit_children( visit_children );   \
@@ -68 +68 @@
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
-                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); } 
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
 
                 if ( i == decls.end() ) break;
@@ -88 +88 @@
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
                 // splice in new declarations after previous decl
-                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); } 
+                if ( !empty( afterDecls ) ) { decls.splice( i, *afterDecls ); }
 
                 if ( i == decls.end() ) break;
@@ -104 +104 @@
 void PassVisitor< pass_type >::handleStatementList( std::list< Statement * > & statements, func_t func ) {
         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();
@@ -181 +187 @@
 Statement * PassVisitor< pass_type >::visitStatement( Statement * stmt ) {
         return handleStatement( stmt, [this]( Statement * stmt ) {
-                maybeAccept( stmt, *this ); 
+                maybeAccept( stmt, *this );
                 return stmt;
         });
@@ -212 +218 @@
                 expr->accept( *this );
                 return expr;
-        });             
+        });
 }
 
@@ -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() ) {