Changes in src/Common/PassVisitor.impl.h [c6c682cf:37cdd97]

File:

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

src/Common/PassVisitor.impl.h

@@ -532 +532 @@
                         indexerAddId( &func );
                         maybeAccept_impl( node->type, *this );
-                        // First remember that we are now within a function.
+                        // 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;
-                        // The function body needs to have the same scope as parameters.
-                        // A CompoundStmt will not enter a new scope if atFunctionTop is true.
-                        ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                        atFunctionTop = true;
                         maybeAccept_impl( node->statements, *this );
                         maybeAccept_impl( node->attributes, *this );
@@ -570 +567 @@
                         indexerAddId( &func );
                         maybeAccept_impl( node->type, *this );
-                        // First remember that we are now within a function.
+                        // 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;
-                        // The function body needs to have the same scope as parameters.
-                        // A CompoundStmt will not enter a new scope if atFunctionTop is true.
-                        ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                        atFunctionTop = true;
                         maybeAccept_impl( node->statements, *this );
                         maybeAccept_impl( node->attributes, *this );
@@ -607 +601 @@
                         indexerAddId( &func );
                         maybeMutate_impl( node->type, *this );
-                        // First remember that we are now within a function.
+                        // 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;
-                        // The function body needs to have the same scope as parameters.
-                        // A CompoundStmt will not enter a new scope if atFunctionTop is true.
-                        ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                        atFunctionTop = true;
                         maybeMutate_impl( node->statements, *this );
                         maybeMutate_impl( node->attributes, *this );
@@ -1016 +1007 @@
         VISIT_START( node );
         {
-                // Do not enter a new scope if atFunctionTop is true, don't leave one either.
-                ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                auto guard1 = makeFuncGuard( [this, go = !atFunctionTop]() { if ( go ) indexerScopeEnter(); }, [this, go = !atFunctionTop]() { if ( go ) indexerScopeLeave(); } );
+                // 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 guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
-                atFunctionTop = false;
+                inFunction = false;
                 visitStatementList( node->kids );
         }
@@ -1030 +1021 @@
         VISIT_START( node );
         {
-                // Do not enter a new scope if atFunctionTop is true, don't leave one either.
-                ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                auto guard1 = makeFuncGuard( [this, go = !atFunctionTop]() { if ( go ) indexerScopeEnter(); }, [this, go = !atFunctionTop]() { if ( go ) indexerScopeLeave(); } );
+                // 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 guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
-                atFunctionTop = false;
+                inFunction = false;
                 visitStatementList( node->kids );
         }
@@ -1044 +1035 @@
         MUTATE_START( node );
         {
-                // Do not enter a new scope if atFunctionTop is true, don't leave one either.
-                ValueGuard< bool > oldAtFunctionTop( atFunctionTop );
-                auto guard1 = makeFuncGuard( [this, go = !atFunctionTop]() { if ( go ) indexerScopeEnter(); }, [this, go = !atFunctionTop]() { if ( go ) indexerScopeLeave(); } );
+                // 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 guard2 = makeFuncGuard( [this]() { call_beginScope();   }, [this]() { call_endScope();     } );
-                atFunctionTop = false;
+                inFunction = false;
                 mutateStatementList( node->kids );
         }