Changeset 777ed2b for src/SymTab/Indexer.cc

Timestamp:

Jul 11, 2018, 11:55:59 AM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

File:

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

src/SymTab/Indexer.cc

@@ -272 +272 @@
         }
 
+        NamedTypeDecl *Indexer::globalLookupType( const std::string &id ) const {
+                return lookupTypeAtScope( id, 0 );
+        }
+
+        StructDecl *Indexer::globalLookupStruct( const std::string &id ) const {
+                return lookupStructAtScope( id, 0 );
+        }
+
+        UnionDecl *Indexer::globalLookupUnion( const std::string &id ) const {
+                return lookupUnionAtScope( id, 0 );
+        }
+
+        EnumDecl *Indexer::globalLookupEnum( const std::string &id ) const {
+                return lookupEnumAtScope( id, 0 );
+        }
+
         EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
                 if ( ! tables ) return 0;
@@ -347 +363 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTypeAtScope( id, scope );
 
                 TypeTable::const_iterator ret = tables->typeTable.find( id );
@@ -355 +372 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupStructAtScope( id, scope );
 
                 StructTable::const_iterator ret = tables->structTable.find( id );
@@ -363 +381 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupEnumAtScope( id, scope );
 
                 EnumTable::const_iterator ret = tables->enumTable.find( id );
@@ -371 +390 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupUnionAtScope( id, scope );
 
                 UnionTable::const_iterator ret = tables->unionTable.find( id );
@@ -379 +399 @@
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTraitAtScope( id, scope );
 
                 TraitTable::const_iterator ret = tables->traitTable.find( id );
@@ -486 +507 @@
 
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
-                if ( existing->get_base() == 0 ) {
+                if ( existing->base == nullptr ) {
                         return false;
-                } else if ( added->get_base() == 0 ) {
+                } else if ( added->base == nullptr ) {
                         return true;
                 } else {
-                        SemanticError( added, "redeclaration of " );
-                }
+                        assert( existing->base && added->base );
+                        // typedef redeclarations are errors only if types are different
+                        if ( ! ResolvExpr::typesCompatible( existing->base, added->base, Indexer() ) ) {
+                                SemanticError( added->location, "redeclaration of " + added->name );
+                        }
+                }
+                // does not need to be added to the table if both existing and added have a base that are the same
+                return true;
         }
 
@@ -499 +526 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
@@ -532 +559 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
@@ -551 +578 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
@@ -575 +602 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
@@ -594 +621 @@
                 makeWritable();
 
-                const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {