Changes in src/SymTab/Indexer.cc [6fc5c14:33a25f9]

File:

• src/SymTab/Indexer.cc (modified) (5 diffs)

src/SymTab/Indexer.cc

@@ -40 +40 @@
 
 namespace SymTab {
+        struct NewScope {
+                NewScope( SymTab::Indexer & indexer ) : indexer( indexer ) { indexer.enterScope(); }
+                ~NewScope() { indexer.leaveScope(); }
+                SymTab::Indexer & indexer;
+        };
+
+        template< typename TreeType, typename VisitorType >
+        inline void acceptNewScope( TreeType *tree, VisitorType &visitor ) {
+                visitor.enterScope();
+                maybeAccept( tree, visitor );
+                visitor.leaveScope();
+        }
+
         typedef std::unordered_map< std::string, DeclarationWithType* > MangleTable;
         typedef std::unordered_map< std::string, MangleTable > IdTable;
@@ -185 +198 @@
         }
 
-        Indexer::Indexer() : tables( 0 ), scope( 0 ) {}
-
-        Indexer::Indexer( const Indexer &that ) : doDebug( that.doDebug ), tables( newRef( that.tables ) ), scope( that.scope ) {}
-
-        Indexer::Indexer( Indexer &&that ) : doDebug( that.doDebug ), tables( that.tables ), scope( that.scope ) {
+        Indexer::Indexer( bool _doDebug ) : tables( 0 ), scope( 0 ), doDebug( _doDebug ) {}
+
+        Indexer::Indexer( const Indexer &that ) : tables( newRef( that.tables ) ), scope( that.scope ), doDebug( that.doDebug ) {}
+
+        Indexer::Indexer( Indexer &&that ) : tables( that.tables ), scope( that.scope ), doDebug( that.doDebug ) {
                 that.tables = 0;
         }
@@ -407 +420 @@
                 makeWritable();
 
-                const std::string &name = decl->name;
+                const std::string &name = decl->get_name();
                 std::string mangleName;
-                if ( LinkageSpec::isOverridable( decl->linkage ) ) {
+                if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
                         // mangle the name without including the appropriate suffix, so overridable routines are placed into the
                         // same "bucket" as their user defined versions.
@@ -418 +431 @@
 
                 // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
-                if ( ! LinkageSpec::isMangled( decl->linkage ) ) {
+                if ( ! LinkageSpec::isMangled( decl->get_linkage() ) ) {
                         // NOTE this is broken in Richard's original code in such a way that it never triggers (it
                         // doesn't check decls that have the same manglename, and all C-linkage decls are defined to
@@ -571 +584 @@
 
                 if ( doDebug ) {
-                        std::cerr << "--- Entering scope " << scope << std::endl;
+                        std::cout << "--- Entering scope " << scope << std::endl;
                 }
         }
 
         void Indexer::leaveScope() {
-                using std::cerr;
+                using std::cout;
 
                 assert( scope > 0 && "cannot leave initial scope" );
-                if ( doDebug ) {
-                        cerr << "--- Leaving scope " << scope << " containing" << std::endl;
-                }
                 --scope;
 
                 while ( tables && tables->scope > scope ) {
                         if ( doDebug ) {
-                                dump( tables->idTable, cerr );
-                                dump( tables->typeTable, cerr );
-                                dump( tables->structTable, cerr );
-                                dump( tables->enumTable, cerr );
-                                dump( tables->unionTable, cerr );
-                                dump( tables->traitTable, cerr );
+                                cout << "--- Leaving scope " << tables->scope << " containing" << std::endl;
+                                dump( tables->idTable, cout );
+                                dump( tables->typeTable, cout );
+                                dump( tables->structTable, cout );
+                                dump( tables->enumTable, cout );
+                                dump( tables->unionTable, cout );
+                                dump( tables->traitTable, cout );
                         }