Changes in src/Common/PassVisitor.impl.h [61d9b4b:cc32d83]

File:

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

src/Common/PassVisitor.impl.h

@@ -404 +404 @@
                         indexerAddId( &func );
                         maybeAccept_impl( node->type, *this );
-                        // function body needs to have the same scope as parameters - CompoundStmt will not enter
-                        // a new scope if inFunction is true
-                        ValueGuard< bool > oldInFunction( inFunction );
-                        inFunction = true;
                         maybeAccept_impl( node->statements, *this );
                         maybeAccept_impl( node->attributes, *this );
@@ -438 +434 @@
                         indexerAddId( &func );
                         maybeMutate_impl( node->type, *this );
-                        // function body needs to have the same scope as parameters - CompoundStmt will not enter
-                        // a new scope if inFunction is true
-                        ValueGuard< bool > oldInFunction( inFunction );
-                        inFunction = true;
                         maybeMutate_impl( node->statements, *this );
                         maybeMutate_impl( node->attributes, *this );
@@ -720 +712 @@
         VISIT_START( node );
         {
-                // do not enter a new scope if inFunction is true - needs to check old state before the assignment
-                ValueGuard< bool > oldInFunction( inFunction );
-                auto guard1 = makeFuncGuard( [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeEnter(); }, [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeLeave(); } );
+                auto guard1 = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 auto guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
-                inFunction = false;
                 visitStatementList( node->kids );
         }
@@ -734 +723 @@
         MUTATE_START( node );
         {
-                // do not enter a new scope if inFunction is true - needs to check old state before the assignment
-                ValueGuard< bool > oldInFunction( inFunction );
-                auto guard1 = makeFuncGuard( [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeEnter(); }, [this, &oldInFunction]() { if ( ! oldInFunction.old ) indexerScopeLeave(); } );
+                auto guard1 = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 auto guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
-                inFunction = false;
                 mutateStatementList( node->kids );
         }
@@ -842 +828 @@
         VISIT_START( node );
 
-        {
-                // while statements introduce a level of scope (for the initialization)
-                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeAccept_impl( node->initialization, *this );
-                visitExpression ( node->condition );
-                node->body = visitStatement( node->body );
-        }
+        visitExpression( node->condition );
+        node->body = visitStatement( node->body );
 
         VISIT_END( node );
@@ -857 +838 @@
         MUTATE_START( node );
 
-        {
-                // while statements introduce a level of scope (for the initialization)
-                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeMutate_impl( node->initialization, *this );
-                node->condition = mutateExpression( node->condition );
-                node->body      = mutateStatement ( node->body      );
-        }
-
+        node->condition = mutateExpression( node->condition );
+        node->body      = mutateStatement ( node->body      );
 
         MUTATE_END( Statement, node );
@@ -2098 +2073 @@
 
 //--------------------------------------------------------------------------
-// DefaultArgExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( DefaultArgExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        maybeAccept_impl( node->expr, *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( DefaultArgExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env, *this );
-        indexerScopedMutate( node->result, *this );
-        maybeMutate_impl( node->expr, *this );
-
-        MUTATE_END( Expression, node );
-}
-
-//--------------------------------------------------------------------------
-// GenericExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( GenericExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        maybeAccept_impl( node->control, *this );
-        for ( GenericExpr::Association & assoc : node->associations ) {
-                indexerScopedAccept( assoc.type, *this );
-                maybeAccept_impl( assoc.expr, *this );
-        }
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( GenericExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env, *this );
-        indexerScopedMutate( node->result, *this );
-        maybeMutate_impl( node->control, *this );
-        for ( GenericExpr::Association & assoc : node->associations ) {
-                indexerScopedMutate( assoc.type, *this );
-                maybeMutate_impl( assoc.expr, *this );
-        }
-
-        MUTATE_END( Expression, node );
-}
-
-//--------------------------------------------------------------------------
 // VoidType
 template< typename pass_type >