Changeset d8893ca

Timestamp:

Dec 1, 2017, 2:54:03 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

882ad37

Parents:

1e8bbac9

Message:

Update PassVisitor? to add WithStmt? exprs to the Indexer

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (1 diff)
• PassVisitor.proto.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -298 +298 @@
         void indexerAddUnionFwd ( UnionDecl           * node ) { indexer_impl_addUnionFwd ( pass, 0, node ); }
         void indexerAddTrait    ( TraitDecl           * node ) { indexer_impl_addTrait    ( pass, 0, node ); }
+        void indexerAddWith     ( WithStmt            * node ) { indexer_impl_addWith    ( pass, 0, node ); }
+
 
         template< typename TreeType, typename VisitorType >

src/Common/PassVisitor.impl.h

@@ -985 +985 @@
 }
 
+
+
 //--------------------------------------------------------------------------
 // NullStmt
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WithStmt * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+        maybeAccept_impl( node->exprs, *this );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node );
+                maybeAccept_impl( node->stmt, *this );
+        }
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( WithStmt * node ) {
-        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->exprs, *this );
+        {
+                // catch statements introduce a level of scope (for the caught exception)
+                auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
+                indexerAddWith( node );
+                maybeMutate_impl( node->stmt, *this );
+        }
+        MUTATE_END( Statement, node );
 }
 

src/Common/PassVisitor.proto.h

@@ -208 +208 @@
 INDEXER_FUNC( addUnion  , UnionDecl *           );
 INDEXER_FUNC( addTrait  , TraitDecl *           );
+INDEXER_FUNC( addWith   , WithStmt *            );