Changes in src/Common/PassVisitor.impl.h [33a25f9:522363e]

File:

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

src/Common/PassVisitor.impl.h

@@ -183 +183 @@
 
                 } catch ( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -293 +292 @@
 //------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-// A NOTE ON THE ORDER OF TRAVERSAL
-//
-// Types and typedefs have their base types visited before they are added to the type table.  This is ok, since there is
-// no such thing as a recursive type or typedef.
-//
-//             typedef struct { T *x; } T; // never allowed
-//
-// for structs/unions, it is possible to have recursion, so the decl should be added as if it's incomplete to begin, the
-// members are traversed, and then the complete type should be added (assuming the type is completed by this particular
-// declaration).
-//
-//             struct T { struct T *x; }; // allowed
-//
-// It is important to add the complete type to the symbol table *after* the members/base has been traversed, since that
-// traversal may modify the definition of the type and these modifications should be visible when the symbol table is
-// queried later in this pass.
-//
-// TODO: figure out whether recursive contexts are sensible/possible/reasonable.
 
 //--------------------------------------------------------------------------
@@ -468 +449 @@
         indexerAddEnum( node );
 
-        // unlike structs, traits, and unions, enums inject their members into the global scope
+        // unlike structs, contexts, and unions, enums inject their members into the global scope
         maybeAccept( node->parameters, *this );
         maybeAccept( node->members   , *this );
@@ -532 +513 @@
         }
 
-        // see A NOTE ON THE ORDER OF TRAVERSAL, above
-        // note that assertions come after the type is added to the symtab, since they are not part of the type proper
-        // and may depend on the type itself
         indexerAddType( node );
 
@@ -554 +532 @@
         }
 
-        // see A NOTE ON THE ORDER OF TRAVERSAL, above
-        // note that assertions come after the type is added to the symtab, since they are not part of the type proper
-        // and may depend on the type itself
         indexerAddType( node );
 
@@ -683 +658 @@
 void PassVisitor< pass_type >::visit( IfStmt * node ) {
         VISIT_START( node );
-        {
-                // if statements introduce a level of scope (for the initialization)
+
+        visitExpression( node->condition );
+        node->thenPart = visitStatement( node->thenPart );
+        node->elsePart = visitStatement( node->elsePart );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( IfStmt * node ) {
+        MUTATE_START( node );
+        {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                acceptAll( node->get_initialization(), *this );
-                visitExpression( node->condition );
-                node->thenPart = visitStatement( node->thenPart );
-                node->elsePart = visitStatement( node->elsePart );
-        }
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Statement * PassVisitor< pass_type >::mutate( IfStmt * node ) {
-        MUTATE_START( node );
-        {
-                // if statements introduce a level of scope (for the initialization)
-                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeMutateRef( node->get_initialization(), *this );
                 node->condition = mutateExpression( node->condition );
                 node->thenPart  = mutateStatement ( node->thenPart  );
@@ -736 +706 @@
         VISIT_START( node );
         {
-                // for statements introduce a level of scope (for the initialization)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeAccept( node->initialization, *this );
@@ -750 +719 @@
         MUTATE_START( node );
         {
-                // for statements introduce a level of scope (for the initialization)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeMutateRef( node->initialization, *this );
@@ -879 +847 @@
         VISIT_START( node );
         {
-                // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeAccept( node->decl, *this );
@@ -892 +859 @@
         MUTATE_START( node );
         {
-                // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 maybeMutateRef( node->decl, *this );