Changes in src/SymTab/Indexer.cc [ed34540:1057e3d]

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;
@@ -363 +347 @@
                 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 );
@@ -372 +355 @@
                 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 );
@@ -381 +363 @@
                 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 );
@@ -390 +371 @@
                 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 );
@@ -399 +379 @@
                 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 );
@@ -507 +486 @@
 
         bool addedTypeConflicts( NamedTypeDecl *existing, NamedTypeDecl *added ) {
-                if ( existing->base == nullptr ) {
+                if ( existing->get_base() == 0 ) {
                         return false;
-                } else if ( added->base == nullptr ) {
+                } else if ( added->get_base() == 0 ) {
                         return true;
                 } else {
-                        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;
+                        SemanticError( added, "redeclaration of " );
+                }
         }
 
@@ -526 +499 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
@@ -559 +532 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
@@ -578 +551 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
@@ -602 +575 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
@@ -621 +594 @@
                 makeWritable();
 
-                const std::string &id = decl->name;
+                const std::string &id = decl->get_name();
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {