Changeset fbfb38e for src/SymTab

Timestamp:

Apr 22, 2016, 1:42:36 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

67b1180

Parents:

dc2e7e0 (diff), 6812d89 (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 ctor

Location:

src/SymTab

Files:

• Indexer.cc (modified) (4 diffs)
• Indexer.h (modified) (1 diff)
• Validate.cc (modified) (1 diff)

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

src/SymTab/Indexer.h

@@ -99 +99 @@
                 DeclarationWithType *lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
                 /// returns true if there exists a declaration with C linkage and the given name with a different mangled name
-                bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName ) const;
+                bool hasIncompatibleCDecl( const std::string &id, const std::string &mangleName, unsigned long scope ) const;
                 // equivalents to lookup functions that only look at tables at scope `scope` (which should be >= tables->scope)
                 NamedTypeDecl *lookupTypeAtScope( const std::string &id, unsigned long scope ) const;

src/SymTab/Validate.cc

@@ -515 +515 @@
                                 }
                                 rtt->get_parameters().clear();
-                                cloneAll(typeInst->get_parameters(), rtt->get_parameters());
+                                cloneAll( typeInst->get_parameters(), rtt->get_parameters() );
+                                mutateAll( rtt->get_parameters(), *this );  // recursively fix typedefs on parameters
                         } // if
                         delete typeInst;