Changeset 4670c79

Timestamp:

Jan 31, 2018, 4:50:37 PM (7 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:

c28a038d

Parents:

574894d

Message:

Change Indexer::addWith to take a list of expressions instead of a WithStmt?

Location:

src

Files:

• Common/PassVisitor.h (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (2 diffs)
• Common/PassVisitor.proto.h (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -291 +291 @@
         bool_ref * get_visit_children_ptr() { return visit_children_impl(pass, 0); }
 
-        void indexerScopeEnter  ()                             { indexer_impl_enterScope  ( pass, 0       ); }
-        void indexerScopeLeave  ()                             { indexer_impl_leaveScope  ( pass, 0       ); }
-        void indexerAddId       ( DeclarationWithType * node ) { indexer_impl_addId       ( pass, 0, node ); }
-        void indexerAddType     ( NamedTypeDecl       * node ) { indexer_impl_addType     ( pass, 0, node ); }
-        void indexerAddStruct   ( const std::string   & id   ) { indexer_impl_addStruct   ( pass, 0, id   ); }
-        void indexerAddStruct   ( StructDecl          * node ) { indexer_impl_addStruct   ( pass, 0, node ); }
-        void indexerAddStructFwd( StructDecl          * node ) { indexer_impl_addStructFwd( pass, 0, node ); }
-        void indexerAddEnum     ( EnumDecl            * node ) { indexer_impl_addEnum     ( pass, 0, node ); }
-        void indexerAddUnion    ( const std::string   & id   ) { indexer_impl_addUnion    ( pass, 0, id   ); }
-        void indexerAddUnion    ( UnionDecl           * node ) { indexer_impl_addUnion    ( pass, 0, node ); }
-        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 ); }
+        void indexerScopeEnter  ()                                    { indexer_impl_enterScope  ( pass, 0       ); }
+        void indexerScopeLeave  ()                                    { indexer_impl_leaveScope  ( pass, 0       ); }
+        void indexerAddId       ( DeclarationWithType       * node  ) { indexer_impl_addId       ( pass, 0, node ); }
+        void indexerAddType     ( NamedTypeDecl             * node  ) { indexer_impl_addType     ( pass, 0, node ); }
+        void indexerAddStruct   ( const std::string         & id    ) { indexer_impl_addStruct   ( pass, 0, id   ); }
+        void indexerAddStruct   ( StructDecl                * node  ) { indexer_impl_addStruct   ( pass, 0, node ); }
+        void indexerAddStructFwd( StructDecl                * node  ) { indexer_impl_addStructFwd( pass, 0, node ); }
+        void indexerAddEnum     ( EnumDecl                  * node  ) { indexer_impl_addEnum     ( pass, 0, node ); }
+        void indexerAddUnion    ( const std::string         & id    ) { indexer_impl_addUnion    ( pass, 0, id   ); }
+        void indexerAddUnion    ( UnionDecl                 * node  ) { indexer_impl_addUnion    ( pass, 0, node ); }
+        void indexerAddUnionFwd ( UnionDecl                 * node  ) { indexer_impl_addUnionFwd ( pass, 0, node ); }
+        void indexerAddTrait    ( TraitDecl                 * node  ) { indexer_impl_addTrait    ( pass, 0, node ); }
+        void indexerAddWith     ( std::list< Expression * > & exprs ) { indexer_impl_addWith     ( pass, 0, exprs ); }
 
 

src/Common/PassVisitor.impl.h

@@ -994 +994 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node );
+                indexerAddWith( node->exprs );
                 maybeAccept_impl( node->stmt, *this );
         }
@@ -1007 +1007 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node );
+                indexerAddWith( node->exprs );
                 maybeMutate_impl( node->stmt, *this );
         }

src/Common/PassVisitor.proto.h

@@ -202 +202 @@
 static inline void indexer_impl_##func ( pass_type &, long, type ) { }                                                          \
 
-INDEXER_FUNC( addId     , DeclarationWithType * );
-INDEXER_FUNC( addType   , NamedTypeDecl *       );
-INDEXER_FUNC( addStruct , StructDecl *          );
-INDEXER_FUNC( addEnum   , EnumDecl *            );
-INDEXER_FUNC( addUnion  , UnionDecl *           );
-INDEXER_FUNC( addTrait  , TraitDecl *           );
-INDEXER_FUNC( addWith   , WithStmt *            );
+INDEXER_FUNC( addId     , DeclarationWithType *       );
+INDEXER_FUNC( addType   , NamedTypeDecl *             );
+INDEXER_FUNC( addStruct , StructDecl *                );
+INDEXER_FUNC( addEnum   , EnumDecl *                  );
+INDEXER_FUNC( addUnion  , UnionDecl *                 );
+INDEXER_FUNC( addTrait  , TraitDecl *                 );
+INDEXER_FUNC( addWith   , std::list< Expression * > & );
 
 

src/SymTab/Indexer.cc

@@ -589 +589 @@
         }
 
-        void Indexer::addWith( WithStmt * stmt ) {
-                for ( Expression * expr : stmt->exprs ) {
+        void Indexer::addWith( std::list< Expression * > & withExprs ) {
+                for ( Expression * expr : withExprs ) {
                         if ( expr->result ) {
                                 AggregateDecl * aggr = expr->result->stripReferences()->getAggr();

src/SymTab/Indexer.h

@@ -84 +84 @@
 
                 /// adds all of the IDs from WithStmt exprs
-                void addWith( WithStmt * );
+                void addWith( std::list< Expression * > & withExprs );
 
                 /// adds all of the members of the Aggregate (addWith helper)