Changeset 9c1600c for src/Common/PassVisitor.impl.h

Timestamp:

Jun 2, 2017, 11:23:13 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

acd738aa

Parents:

676cc8c

Message:

PassVisitor? now supports adding statements and using the environment when visiting as well as mutating

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 ); \
@@ -10 +15 @@
 
 #define VISIT_BODY( node )    \
-        call_previsit( node );  \
+        VISIT_START( node );  \
         Visitor::visit( node ); \
-        call_postvisit( node ); \
+        VISIT_END( node ); \
 
 
@@ -39 +44 @@
                 if ( !empty( afterStmts ) ) { statements.splice( i, *afterStmts ); }
                 try {
-                        *i = (*i)->accept( *this );
+                        (*i)->accept( *this );
                 } catch ( SemanticError &e ) {
                         errors.append( e );
@@ -78 +83 @@
         ValueGuardPtr< std::list< Statement* > > oldAfterStmts ( get_afterStmts () );
 
-        Statement *newStmt = maybeVisit( stmt, *this );
+        maybeAccept( stmt, *this );
 
         StmtList_t* beforeStmts = get_beforeStmts();
         StmtList_t* afterStmts  = get_afterStmts();
 
-        if( empty(beforeStmts) && empty(afterStmts) ) { return newStmt; }
+        if( empty(beforeStmts) && empty(afterStmts) ) { return stmt; }
 
         CompoundStmt *compound = new CompoundStmt( noLabels );
         if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
-        compound->get_kids().push_back( newStmt );
+        compound->get_kids().push_back( stmt );
         if( !empty(afterStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *afterStmts ); }
         return compound;
@@ -187 +192 @@
 }
 
+//--------------------------------------------------------------------------
+// CompoundStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CompoundStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+        call_beginScope();
+
+        visitStatementList( node->get_kids() );
+
+        call_endScope();
+        VISIT_END( node );
 }
 
@@ -203 +216 @@
 }
 
+//--------------------------------------------------------------------------
+// ExprStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ExprStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+        call_beginScope();
+
+        visitExpression( node->get_expr() );
+
+        call_endScope();
+        VISIT_END( node );
 }
 
@@ -222 +243 @@
 }
 
+//--------------------------------------------------------------------------
+// IfStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( IfStmt * node ) {
-        VISIT_BODY( 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 );
 }
 
@@ -238 +267 @@
 }
 
+//--------------------------------------------------------------------------
+// WhileStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WhileStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node ); 
+
+        visitExpression( node->get_condition() );
+        node->set_body( visitStatement( node->get_body() ) );
+
+        VISIT_END( node );
 }
 
@@ -253 +289 @@
 }
 
-
+//--------------------------------------------------------------------------
+// WhileStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ForStmt * node ) {
-        VISIT_BODY( 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 );
 }
 
@@ -264 +308 @@
 
         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_BODY( node ); 
+        VISIT_START( node ); 
+
+        visitExpression( node->get_condition() );
+        visitStatementList( node->get_statements() );
+
+        VISIT_END( node );
 }
 
@@ -286 +337 @@
 }
 
+//--------------------------------------------------------------------------
+// SwitchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CaseStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node ); 
+        
+        visitExpression( node->get_condition() );
+        visitStatementList( node->get_statements() );
+        
+        VISIT_END( node );
 }
 
@@ -306 +364 @@
 }
 
+//--------------------------------------------------------------------------
+// ReturnStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ReturnStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+
+        visitExpression( node->get_expr() );
+
+        VISIT_END( node );
 }
 
@@ -320 +384 @@
 }
 
+//--------------------------------------------------------------------------
+// TryStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TryStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+
+        maybeAccept( node->get_block(), *this );
+        acceptAll( node->get_catchers(), *this );
+
+        VISIT_END( node );
 }
 
@@ -335 +406 @@
 }
 
+//--------------------------------------------------------------------------
+// CatchStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( CatchStmt * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+
+        node->set_body( visitStatement( node->get_body() ) );
+        maybeAccept( node->get_decl(), *this );
+
+        VISIT_END( node );
 }
 
@@ -375 +453 @@
 }
 
+//--------------------------------------------------------------------------
+// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( UntypedExpr * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+
+        for ( auto expr : node->get_args() ) {
+                visitExpression( expr );
+        }
+
+        VISIT_END( node );
 }
 
@@ -536 +622 @@
 }
 
+//--------------------------------------------------------------------------
+// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( StmtExpr * node ) {
-        VISIT_BODY( 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 );
 }
 
@@ -640 +737 @@
 }
 
+//--------------------------------------------------------------------------
+// UntypedExpr
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( SingleInit * node ) {
-        VISIT_BODY( node ); 
+        VISIT_START( node );
+
+        visitExpression( node->get_value() );
+
+        VISIT_END( node );
 }