Changeset ba54f7d for src/Common/PassVisitor.h

Timestamp:

Sep 13, 2017, 3:11:24 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c57ded70, db70fe4

Parents:

d130fe8 (diff), 982832e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/Common/PassVisitor.h (modified) (4 diffs)

src/Common/PassVisitor.h

@@ -7 +7 @@
 #include "SynTree/Mutator.h"
 #include "SynTree/Visitor.h"
+
+#include "SymTab/Indexer.h"
 
 #include "SynTree/Initializer.h"
@@ -265 +267 @@
 
         void set_visit_children( bool& ref ) { bool_ref * ptr = visit_children_impl(pass, 0); if(ptr) ptr->set( ref ); }
+
+        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 ); }
+
+        template< typename TreeType, typename VisitorType >
+        friend inline void indexerScopedAccept( TreeType * tree, VisitorType &visitor );
+
+        template< typename TreeType, typename VisitorType >
+        friend inline void indexerScopedMutate( TreeType *& tree, VisitorType &visitor );
 };
 
@@ -296 +317 @@
 protected:
         WithDeclsToAdd() = default;
-        ~WithDeclsToAdd() = default;
+        ~WithDeclsToAdd() {
+                assert( declsToAddBefore.empty() );
+        }
 
 public:
@@ -351 +374 @@
 };
 
+class WithIndexer {
+protected:
+        WithIndexer() {}
+        ~WithIndexer() {}
+
+public:
+        SymTab::Indexer indexer;
+};
+
 #include "PassVisitor.impl.h"