Changeset ed34540 for src/SymTab

Timestamp:

Jun 26, 2018, 1:17:11 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

88d955f

Parents:

0b3b2ae

Message:

Update Indexer handling for typedefs

Location:

src/SymTab

Files:

• Indexer.cc (modified) (2 diffs)
• Indexer.h (modified) (1 diff)

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 );
@@ -503 +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;
         }
 

src/SymTab/Indexer.h

@@ -71 +71 @@
                 TraitDecl *lookupTrait( const std::string &id ) const;
 
+                /// Gets the type declaration with the given ID at global scope
+                NamedTypeDecl *globalLookupType( const std::string &id ) const;
                 /// Gets the struct declaration with the given ID at global scope
                 StructDecl *globalLookupStruct( const std::string &id ) const;