Changes in / [acd738aa:49c9773]

File:

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

src/Common/PassVisitor.impl.h

@@ -1 +1 @@
 #pragma once
-
-#define VISIT_START( node )  \
-        call_previsit( node ); \
-
-#define VISIT_END( node )                \
-        return call_postvisit( node ); \
 
 #define MUTATE_START( node )  \
         call_premutate( node ); \
 
+
 #define MUTATE_END( type, node )                \
         return call_postmutate< type * >( node ); \
@@ -15 +10 @@
 
 #define VISIT_BODY( node )    \
-        VISIT_START( node );  \
+        call_previsit( node );  \
         Visitor::visit( node ); \
-        VISIT_END( node ); \
+        call_postvisit( node ); \
 
 
@@ -44 +39 @@
                 if ( !empty( afterStmts ) ) { statements.splice( i, *afterStmts ); }
                 try {
-                        (*i)->accept( *this );
+                        *i = (*i)->accept( *this );
                 } catch ( SemanticError &e ) {
                         errors.append( e );
@@ -83 +78 @@
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
 
-        maybeAccept( stmt, *this );
+        Statement *newStmt = maybeVisit( stmt, *this );
 
         StmtList_t* beforeStmts = get_beforeStmts();
         StmtList_t* afterStmts  = get_afterStmts();
 
-        if( empty(beforeStmts) && empty(afterStmts) ) { return stmt; }
+        if( empty(beforeStmts) && empty(afterStmts) ) { return newStmt; }
 
         CompoundStmt *compound = new CompoundStmt( noLabels );
         if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
-        compound->get_kids().push_back( stmt );
+        compound->get_kids().push_back( newStmt );
         if( !empty(afterStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *afterStmts ); }
         return compound;
@@ -192 +187 @@
 }
 
-//--------------------------------------------------------------------------
-// CompoundStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CompoundStmt * node ) {
-        VISIT_START( node );
-        call_beginScope();
-
-        visitStatementList( node->get_kids() );
-
-        call_endScope();
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -216 +203 @@
 }
 
-//--------------------------------------------------------------------------
-// ExprStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ExprStmt * node ) {
-        VISIT_START( node );
-        call_beginScope();
-
-        visitExpression( node->get_expr() );
-
-        call_endScope();
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -243 +222 @@
 }
 
-//--------------------------------------------------------------------------
-// IfStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( IfStmt * node ) {
-        VISIT_START( node ); 
-
-        visitExpression( node->get_condition() );
-        node->set_thenPart ( visitStatement( node->get_thenPart() ) );
-        node->set_elsePart ( visitStatement( node->get_elsePart() ) );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -267 +238 @@
 }
 
-//--------------------------------------------------------------------------
-// WhileStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WhileStmt * node ) {
-        VISIT_START( node ); 
-
-        visitExpression( node->get_condition() );
-        node->set_body( visitStatement( node->get_body() ) );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -289 +253 @@
 }
 
-//--------------------------------------------------------------------------
-// WhileStmt
+
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ForStmt * node ) {
-        VISIT_START( node ); 
-
-        acceptAll( node->get_initialization(), *this );
-        visitExpression( node->get_condition() );
-        visitExpression( node->get_increment() );
-        node->set_body( visitStatement( node->get_body() ) );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -308 +264 @@
 
         mutateAll( node->get_initialization(), *this );
-        node->set_condition( mutateExpression( node->get_condition() ) );
-        node->set_increment( mutateExpression( node->get_increment() ) );
-        node->set_body( mutateStatement( node->get_body() ) );
+        node->set_condition(  mutateExpression( node->get_condition() ) );
+        node->set_increment(  mutateExpression( node->get_increment() ) );
+        node->set_body(  mutateStatement( node->get_body() ) );
 
         MUTATE_END( Statement, node );
 }
 
-//--------------------------------------------------------------------------
-// SwitchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SwitchStmt * node ) {
-        VISIT_START( node ); 
-
-        visitExpression( node->get_condition() );
-        visitStatementList( node->get_statements() );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -337 +286 @@
 }
 
-//--------------------------------------------------------------------------
-// SwitchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CaseStmt * node ) {
-        VISIT_START( node ); 
-        
-        visitExpression( node->get_condition() );
-        visitStatementList( node->get_statements() );
-        
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -364 +306 @@
 }
 
-//--------------------------------------------------------------------------
-// ReturnStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ReturnStmt * node ) {
-        VISIT_START( node );
-
-        visitExpression( node->get_expr() );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -384 +320 @@
 }
 
-//--------------------------------------------------------------------------
-// TryStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TryStmt * node ) {
-        VISIT_START( node );
-
-        maybeAccept( node->get_block(), *this );
-        acceptAll( node->get_catchers(), *this );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -406 +335 @@
 }
 
-//--------------------------------------------------------------------------
-// CatchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CatchStmt * node ) {
-        VISIT_START( node );
-
-        node->set_body( visitStatement( node->get_body() ) );
-        maybeAccept( node->get_decl(), *this );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -453 +375 @@
 }
 
-//--------------------------------------------------------------------------
-// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedExpr * node ) {
-        VISIT_START( node );
-
-        for ( auto expr : node->get_args() ) {
-                visitExpression( expr );
-        }
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -622 +536 @@
 }
 
-//--------------------------------------------------------------------------
-// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( StmtExpr * node ) {
-        VISIT_START( node );
-
-        // don't want statements from outer CompoundStmts to be added to this StmtExpr
-        ValueGuardPtr< TypeSubstitution * >      oldEnv        ( get_env_ptr() );
-        ValueGuardPtr< std::list< Statement* > > oldBeforeStmts( get_beforeStmts() );
-        ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
-
-        Visitor::visit( node );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }
 
@@ -737 +640 @@
 }
 
-//--------------------------------------------------------------------------
-// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SingleInit * node ) {
-        VISIT_START( node );
-
-        visitExpression( node->get_value() );
-
-        VISIT_END( node );
+        VISIT_BODY( node ); 
 }