Changeset 0ac366b for src/Common

Timestamp:

Feb 15, 2018, 11:39:12 AM (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:

4a161be

Parents:

f5883bd

Message:

Add Indexer support for deleting identifiers

Location:

src/Common

Files:

• PassVisitor.h (modified) (1 diff)
• PassVisitor.impl.h (modified) (4 diffs)
• PassVisitor.proto.h (modified) (2 diffs)

src/Common/PassVisitor.h

@@ -305 +305 @@
         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 ); }
+        void indexerAddWith     ( std::list< Expression * > & exprs, BaseSyntaxNode * withStmt ) { indexer_impl_addWith     ( pass, 0, exprs, withStmt ); }
 
 

src/Common/PassVisitor.impl.h

@@ -398 +398 @@
                 // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->withExprs );
+                indexerAddWith( node->withExprs, node );
                 {
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
@@ -428 +428 @@
                 // shadow with exprs and not the other way around.
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->withExprs );
+                indexerAddWith( node->withExprs, node );
                 {
                         auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
@@ -1069 +1069 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node->exprs, node );
                 maybeAccept_impl( node->stmt, *this );
         }
@@ -1082 +1082 @@
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                indexerAddWith( node->exprs );
+                indexerAddWith( node->exprs, node );
                 maybeMutate_impl( node->stmt, *this );
         }

src/Common/PassVisitor.proto.h

@@ -193 +193 @@
 
 
-#define INDEXER_FUNC( func, type )                                                                                             \
+#define INDEXER_FUNC1( func, type )                                                                                             \
 template<typename pass_type>                                                                                                   \
 static inline auto indexer_impl_##func ( pass_type & pass, int, type arg ) -> decltype( pass.indexer.func( arg ), void() ) {   \
@@ -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   , std::list< Expression * > & );
+#define INDEXER_FUNC2( func, type1, type2 )                                                                                             \
+template<typename pass_type>                                                                                                   \
+static inline auto indexer_impl_##func ( pass_type & pass, int, type1 arg1, type2 arg2 ) -> decltype( pass.indexer.func( arg1, arg2 ), void() ) {   \
+        pass.indexer.func( arg1, arg2 );                                                                                                \
+}                                                                                                                              \
+                                                                                                                               \
+template<typename pass_type>                                                                                                   \
+static inline void indexer_impl_##func ( pass_type &, long, type1, type2 ) { }
+
+
+INDEXER_FUNC1( addId     , DeclarationWithType *       );
+INDEXER_FUNC1( addType   , NamedTypeDecl *             );
+INDEXER_FUNC1( addStruct , StructDecl *                );
+INDEXER_FUNC1( addEnum   , EnumDecl *                  );
+INDEXER_FUNC1( addUnion  , UnionDecl *                 );
+INDEXER_FUNC1( addTrait  , TraitDecl *                 );
+INDEXER_FUNC2( addWith   , std::list< Expression * > &, BaseSyntaxNode * );