Changes in src/Common/PassVisitor.proto.h [9dcb653:3268a58]

File:

• src/Common/PassVisitor.proto.h (modified) (6 diffs)

src/Common/PassVisitor.proto.h

@@ -41 +41 @@
 };
 
+
 class bool_ref {
 public:
@@ -58 +59 @@
         bool * m_ref;
 };
-
-template< typename TreeType, typename VisitorType >
-inline void indexerScopedAccept( TreeType * tree, VisitorType & visitor ) {
-        auto guard = makeFuncGuard(
-                [&visitor]() { visitor.indexerScopeEnter(); },
-                [&visitor]() { visitor.indexerScopeLeave(); }
-        );
-        maybeAccept( tree, visitor );
-}
-
-template< typename TreeType, typename MutatorType >
-inline void indexerScopedMutate( TreeType *& tree, MutatorType & mutator ) {
-        auto guard = makeFuncGuard(
-                [&mutator]() { mutator.indexerScopeEnter(); },
-                [&mutator]() { mutator.indexerScopeLeave(); }
-        );
-        tree = maybeMutate( tree, mutator );
-}
-
-template< typename TreeType, typename MutatorType >
-inline void maybeMutateRef( TreeType *& tree, MutatorType & mutator ) {
-        tree = maybeMutate( tree, mutator );
-}
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -115 +93 @@
 static inline void postvisit_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) node_type * node, __attribute__((unused)) long unused ) {}
 
-//---------------------------------------------------------
 // Mutate
 template<typename pass_type, typename node_type>
@@ -134 +111 @@
 static inline return_type postmutate_impl( __attribute__((unused)) pass_type& pass, node_type * node, __attribute__((unused)) long unused ) { return node; }
 
-//---------------------------------------------------------
 // Begin/End scope
 template<typename pass_type>
@@ -153 +129 @@
 static inline void end_scope_impl( __attribute__((unused)) pass_type& pass, __attribute__((unused)) long unused ) {}
 
-//---------------------------------------------------------
 // Fields
 #define FIELD_PTR( type, name )                                                                                                        \
@@ -170 +145 @@
 FIELD_PTR( at_cleanup_t, at_cleanup )
 FIELD_PTR( PassVisitor<pass_type> * const, visitor )
-
-//---------------------------------------------------------
-// Indexer
-template<typename pass_type>
-static inline auto indexer_impl_enterScope( pass_type & pass, int ) -> decltype( pass.indexer.enterScope(), void() ) {
-        pass.indexer.enterScope();
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_enterScope( pass_type &, int ) {}
-
-template<typename pass_type>
-static inline auto indexer_impl_leaveScope( pass_type & pass, int ) -> decltype( pass.indexer.leaveScope(), void() ) {
-        pass.indexer.leaveScope();
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_leaveScope( pass_type &, int ) {}
-
-
-#define INDEXER_FUNC( func, type )                                                                                             \
-template<typename pass_type>                                                                                                   \
-static inline auto indexer_impl_##func ( pass_type & pass, int, type arg ) -> decltype( pass.indexer.func( arg ), void() ) {   \
-        pass.indexer.func( arg );                                                                                                \
-}                                                                                                                              \
-                                                                                                                               \
-template<typename pass_type>                                                                                                   \
-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 *           );
-
-
-template<typename pass_type>
-static inline auto indexer_impl_addStructFwd( pass_type & pass, int, StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
-        StructDecl * fwd = new StructDecl( decl->name );
-        cloneAll( decl->parameters, fwd->parameters );
-        pass.indexer.addStruct( fwd );
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_addStructFwd( pass_type &, int, StructDecl * ) {}
-
-template<typename pass_type>
-static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
-        UnionDecl * fwd = new UnionDecl( decl->name );
-        cloneAll( decl->parameters, fwd->parameters );
-        pass.indexer.addUnion( fwd );
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_addUnionFwd( pass_type &, int, UnionDecl * ) {}
-
-template<typename pass_type>
-static inline auto indexer_impl_addStruct( pass_type & pass, int, const std::string & str ) -> decltype( pass.indexer.addStruct( str ), void() ) {
-        if ( ! pass.indexer.lookupStruct( str ) ) {
-                pass.indexer.addStruct( str );
-        }
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_addStruct( pass_type &, int, const std::string & ) {}
-
-template<typename pass_type>
-static inline auto indexer_impl_addUnion( pass_type & pass, int, const std::string & str ) -> decltype( pass.indexer.addUnion( str ), void() ) {
-        if ( ! pass.indexer.lookupUnion( str ) ) {
-                pass.indexer.addUnion( str );
-        }
-}
-
-template<typename pass_type>
-static inline auto indexer_impl_addUnion( pass_type &, int, const std::string & ) {}