Changes in src/AST/SymbolTable.cpp [b9fe89b:d859a30]

File:

• src/AST/SymbolTable.cpp (modified) (8 diffs)

src/AST/SymbolTable.cpp

@@ -18 +18 @@
 #include <cassert>
 
-#include "Copy.hpp"
 #include "Decl.hpp"
 #include "Expr.hpp"
@@ -88 +87 @@
 }
 
-SymbolTable::SymbolTable( ErrorDetection errorMode )
+SymbolTable::SymbolTable()
 : idTable(), typeTable(), structTable(), enumTable(), unionTable(), traitTable(),
-  prevScope(), scope( 0 ), repScope( 0 ), errorMode(errorMode) { ++*stats().count; }
+  prevScope(), scope( 0 ), repScope( 0 ) { ++*stats().count; }
 
 SymbolTable::~SymbolTable() { stats().size->push( idTable ? idTable->size() : 0 ); }
-
-void SymbolTable::OnFindError( CodeLocation location, std::string error ) const {
-        assertf( errorMode != AssertClean, "Name collision/redefinition, found during a compilation phase where none should be possible.  Detail: %s", error.c_str() );
-        if (errorMode == ValidateOnAdd) {
-                SemanticError(location, error);
-        }
-        assertf( errorMode == IgnoreErrors, "Unrecognized symbol-table error mode %d", errorMode );
-}
 
 void SymbolTable::enterScope() {
@@ -277 +268 @@
 }
 
-bool SymbolTable::addedTypeConflicts(
-                const NamedTypeDecl * existing, const NamedTypeDecl * added ) const {
-        if ( existing->base == nullptr ) {
-                return false;
-        } else if ( added->base == nullptr ) {
+namespace {
+        /// true if redeclaration conflict between two types
+        bool addedTypeConflicts( const NamedTypeDecl * existing, const NamedTypeDecl * added ) {
+                if ( existing->base == nullptr ) {
+                        return false;
+                } else if ( added->base == nullptr ) {
+                        return true;
+                } else {
+                        // typedef redeclarations are errors only if types are different
+                        if ( ! ResolvExpr::typesCompatible( existing->base, added->base, SymbolTable{} ) ) {
+                                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;
-        } else {
-                // typedef redeclarations are errors only if types are different
-                if ( ! ResolvExpr::typesCompatible( existing->base, added->base ) ) {
-                        OnFindError( 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;
-}
-
-bool SymbolTable::addedDeclConflicts( 
-                const AggregateDecl * existing, const AggregateDecl * added ) const {
-        if ( ! existing->body ) {
-                return false;
-        } else if ( added->body ) {
-                OnFindError( added, "redeclaration of " );
-        }
-        return true;
+        }
+
+        /// true if redeclaration conflict between two aggregate declarations
+        bool addedDeclConflicts( const AggregateDecl * existing, const AggregateDecl * added ) {
+                if ( ! existing->body ) {
+                        return false;
+                } else if ( added->body ) {
+                        SemanticError( added, "redeclaration of " );
+                }
+                return true;
+        }
 }
 
@@ -649 +642 @@
         } else if ( existing.id->linkage.is_mangled
                         || ResolvExpr::typesCompatible(
-                                added->get_type(), existing.id->get_type() ) ) {
+                                added->get_type(), existing.id->get_type(), SymbolTable{} ) ) {
 
                 // it is a conflict if one declaration is deleted and the other is not
                 if ( deleter && ! existing.deleter ) {
                         if ( handleConflicts.mode == OnConflict::Error ) {
-                                OnFindError( added, "deletion of defined identifier " );
+                                SemanticError( added, "deletion of defined identifier " );
                         }
                         return true;
                 } else if ( ! deleter && existing.deleter ) {
                         if ( handleConflicts.mode == OnConflict::Error ) {
-                                OnFindError( added, "definition of deleted identifier " );
+                                SemanticError( added, "definition of deleted identifier " );
                         }
                         return true;
@@ -667 +660 @@
                 if ( isDefinition( added ) && isDefinition( existing.id ) ) {
                         if ( handleConflicts.mode == OnConflict::Error ) {
-                                OnFindError( added,
+                                SemanticError( added,
                                         isFunction( added ) ?
                                                 "duplicate function definition for " :
@@ -676 +669 @@
         } else {
                 if ( handleConflicts.mode == OnConflict::Error ) {
-                        OnFindError( added, "duplicate definition for " );
+                        SemanticError( added, "duplicate definition for " );
                 }
                 return true;
@@ -728 +721 @@
                 // Check that a Cforall declaration doesn't override any C declaration
                 if ( hasCompatibleCDecl( name, mangleName ) ) {
-                        OnFindError( decl, "Cforall declaration hides C function " );
+                        SemanticError( decl, "Cforall declaration hides C function " );
                 }
         } else {
@@ -734 +727 @@
                 // type-compatibility, which it may not be.
                 if ( hasIncompatibleCDecl( name, mangleName ) ) {
-                        OnFindError( decl, "conflicting overload of C function " );
+                        SemanticError( decl, "conflicting overload of C function " );
                 }
         }