Changeset 6840e7c for src/SymTab/Indexer.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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' into cleanup-dtors

File:

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

src/SymTab/Indexer.cc

@@ -407 +407 @@
                 makeWritable();
 
-                const std::string &name = decl->get_name();
+                const std::string &name = decl->name;
                 std::string mangleName;
-                if ( LinkageSpec::isOverridable( decl->get_linkage() ) ) {
+                if ( LinkageSpec::isOverridable( decl->linkage ) ) {
                         // mangle the name without including the appropriate suffix, so overridable routines are placed into the
                         // same "bucket" as their user defined versions.
@@ -418 +418 @@
 
                 // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
-                if ( ! LinkageSpec::isMangled( decl->get_linkage() ) ) {
+                if ( ! LinkageSpec::isMangled( decl->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 +571 @@
 
                 if ( doDebug ) {
-                        std::cout << "--- Entering scope " << scope << std::endl;
+                        std::cerr << "--- Entering scope " << scope << std::endl;
                 }
         }
 
         void Indexer::leaveScope() {
-                using std::cout;
+                using std::cerr;
 
                 assert( scope > 0 && "cannot leave initial scope" );
+                if ( doDebug ) {
+                        cerr << "--- Leaving scope " << scope << " containing" << std::endl;
+                }
                 --scope;
 
                 while ( tables && tables->scope > scope ) {
                         if ( doDebug ) {
-                                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 );
+                                dump( tables->idTable, cerr );
+                                dump( tables->typeTable, cerr );
+                                dump( tables->structTable, cerr );
+                                dump( tables->enumTable, cerr );
+                                dump( tables->unionTable, cerr );
+                                dump( tables->traitTable, cerr );
                         }