Changeset 2ad4b49 for src/Common/PassVisitor.impl.h

Timestamp:

Jun 4, 2018, 4:29:23 PM (6 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, with_gc

Children:

41770ed1, d885a58, f77dbc0

Parents:

1ddbf3b (diff), ee3c93d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Common/PassVisitor.impl.h

@@ -828 +828 @@
         VISIT_START( node );
 
-        visitExpression( node->condition );
-        node->body = visitStatement( node->body );
+        {
+                // 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 );
+        }
 
         VISIT_END( node );
@@ -838 +843 @@
         MUTATE_START( node );
 
-        node->condition = mutateExpression( node->condition );
-        node->body      = mutateStatement ( node->body      );
+        {
+                // 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      );
+        }
+
 
         MUTATE_END( Statement, node );