Changes in src/SymTab/Indexer.cc [afc1045:0cb1d61]

File:

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

src/SymTab/Indexer.cc

@@ -511 +511 @@
         }
 
-        bool Indexer::hasIncompatibleCDecl( const std::string &id, const std::string &mangleName ) const {
+        bool Indexer::hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
                 if ( ! tables ) return false;
+                if ( tables->scope < scope ) return false;
 
                 IdTable::const_iterator decls = tables->idTable.find( id );
@@ -524 +525 @@
                 }
 
-                return tables->base.hasIncompatibleCDecl( id, mangleName );
+                return tables->base.hasIncompatibleCDecl( id, mangleName, scope );
         }
         
@@ -617 +618 @@
                 DeclarationWithType *existing = lookupIdAtScope( name, mangleName, scope );
                 if ( ! existing || ! addedIdConflicts( existing, decl ) ) {
-                        // this ensures that no two declarations with the same unmangled name both have C linkage
-                        if ( decl->get_linkage() == LinkageSpec::C && hasIncompatibleCDecl( name, mangleName ) ) {
+                        // this ensures that no two declarations with the same unmangled name at the same scope both have C linkage
+                        if ( decl->get_linkage() == LinkageSpec::C && hasIncompatibleCDecl( name, mangleName, scope ) ) {
                                 throw SemanticError( "invalid overload of C function ", decl );
                         } // NOTE this is broken in Richard's original code in such a way that it never triggers (it 
@@ -783 +784 @@
             using std::cerr;
 
-            cerr << "===idTable===" << std::endl;
-            if ( tables ) dump( tables->idTable, os );
-            cerr << "===typeTable===" << std::endl;
-            if ( tables ) dump( tables->typeTable, os );
-            cerr << "===structTable===" << std::endl;
-            if ( tables ) dump( tables->structTable, os );
-            cerr << "===enumTable===" << std::endl;
-            if ( tables ) dump( tables->enumTable, os );
-            cerr << "===unionTable===" << std::endl;
-            if ( tables ) dump( tables->unionTable, os );
-            cerr << "===contextTable===" << std::endl;
-            if ( tables ) dump( tables->traitTable, os );
+                if ( tables ) {
+                        os << "--- scope " << tables->scope << " ---" << std::endl;
+
+                        os << "===idTable===" << std::endl;
+                        dump( tables->idTable, os );
+                        os << "===typeTable===" << std::endl;
+                        dump( tables->typeTable, os );
+                        os << "===structTable===" << std::endl;
+                        dump( tables->structTable, os );
+                        os << "===enumTable===" << std::endl;
+                        dump( tables->enumTable, os );
+                        os << "===unionTable===" << std::endl;
+                        dump( tables->unionTable, os );
+                        os << "===contextTable===" << std::endl;
+                        dump( tables->traitTable, os );
+
+                        tables->base.print( os, indent );
+                } else {
+                        os << "--- end ---" << std::endl;
+                }
+                
         }
 } // namespace SymTab