Changes in src/SymTab/Indexer.cc [0ac366b:d55d7a6]

File:

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

src/SymTab/Indexer.cc

@@ -286 +286 @@
         }
 
-        const Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
-                if ( ! tables ) return nullptr;
-                if ( tables->scope < scope ) return nullptr;
+        DeclarationWithType *Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
+                if ( ! tables ) return 0;
+                if ( tables->scope < scope ) return 0;
 
                 IdTable::const_iterator decls = tables->idTable.find( id );
@@ -294 +294 @@
                         const MangleTable &mangleTable = decls->second;
                         MangleTable::const_iterator decl = mangleTable.find( mangleName );
-                        if ( decl != mangleTable.end() ) return &decl->second;
+                        if ( decl != mangleTable.end() ) return decl->second.id;
                 }
 
                 return tables->base.lookupIdAtScope( id, mangleName, scope );
-        }
-
-        Indexer::IdData * Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) {
-                return const_cast<IdData *>(const_cast<const Indexer *>(this)->lookupIdAtScope( id, mangleName, scope ));
         }
 
@@ -377 +373 @@
         }
 
-        bool addedIdConflicts( Indexer::IdData & existing, DeclarationWithType *added, BaseSyntaxNode * deleteStmt, Indexer::ConflictFunction handleConflicts ) {
+        bool addedIdConflicts( DeclarationWithType *existing, DeclarationWithType *added ) {
                 // if we're giving the same name mangling to things of different types then there is something wrong
-                assert( (dynamic_cast<ObjectDecl*>( added ) && dynamic_cast<ObjectDecl*>( existing.id ) )
-                        || (dynamic_cast<FunctionDecl*>( added ) && dynamic_cast<FunctionDecl*>( existing.id ) ) );
-
-                if ( LinkageSpec::isOverridable( existing.id->get_linkage() ) ) {
+                assert( (dynamic_cast<ObjectDecl*>( added ) && dynamic_cast<ObjectDecl*>( existing ) )
+                        || (dynamic_cast<FunctionDecl*>( added ) && dynamic_cast<FunctionDecl*>( existing ) ) );
+
+                if ( LinkageSpec::isOverridable( existing->get_linkage() ) ) {
                         // new definition shadows the autogenerated one, even at the same scope
                         return false;
-                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing.id->get_type(), Indexer() ) ) {
-
-                        // it is a conflict if one declaration is deleted and the other is not
-                        if ( deleteStmt && ! existing.deleteStmt ) {
-                                return handleConflicts( existing, "deletion of defined identifier " );
-                        } else if ( ! deleteStmt && existing.deleteStmt ) {
-                                return handleConflicts( existing, "definition of deleted identifier " );
-                        }
-
+                } else if ( LinkageSpec::isMangled( added->get_linkage() ) || ResolvExpr::typesCompatible( added->get_type(), existing->get_type(), Indexer() ) ) {
                         // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
                         // we should ignore outermost pointer qualifiers, except _Atomic?
-                        FunctionDecl * newentry = dynamic_cast< FunctionDecl * >( added );
-                        FunctionDecl * oldentry = dynamic_cast< FunctionDecl * >( existing.id );
+                        FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( added );
+                        FunctionDecl *oldentry = dynamic_cast< FunctionDecl* >( existing );
                         if ( newentry && oldentry ) {
                                 if ( newentry->get_statements() && oldentry->get_statements() ) {
-                                        return handleConflicts( existing, "duplicate function definition for " );
+                                        throw SemanticError( added, "duplicate function definition for " );
                                 } // if
                         } else {
@@ -407 +395 @@
                                 // xxx - perhaps it's actually if either is intrinsic then this is okay?
                                 //       might also need to be same storage class?
-                                ObjectDecl * newobj = dynamic_cast< ObjectDecl * >( added );
-                                ObjectDecl * oldobj = dynamic_cast< ObjectDecl * >( existing.id );
+                                ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( added );
+                                ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( existing );
                                 if ( ! newobj->get_storageClasses().is_extern && ! oldobj->get_storageClasses().is_extern ) {
-                                        return handleConflicts( existing, "duplicate object definition for " );
+                                        throw SemanticError( added, "duplicate object definition for " );
                                 } // if
                         } // if
                 } else {
-                        return handleConflicts( existing, "duplicate definition for " );
+                        throw SemanticError( added, "duplicate definition for " );
                 } // if
 
@@ -420 +408 @@
         }
 
-        void Indexer::addId( DeclarationWithType *decl, ConflictFunction handleConflicts, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) {
+        void Indexer::addId( DeclarationWithType *decl, Expression * baseExpr ) {
                 if ( decl->name == "" ) return;
                 debugPrint( "Adding Id " << decl->name << std::endl );
@@ -443 +431 @@
                         // isomorphic to C type-compatibility, which it may not be.
                         if ( hasIncompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( "conflicting overload of C function ", decl );
-                        }
-                } else {
-                        // Check that a Cforall declaration doesn't override any C declaration
+                                throw SemanticError( decl, "conflicting overload of C function " );
+                        }
+                } else {
+                        // Check that a Cforall declaration doesn't overload any C declaration
                         if ( hasCompatibleCDecl( name, mangleName, scope ) ) {
-                                throw SemanticError( "Cforall declaration hides C function ", decl );
+                                throw SemanticError( decl, "Cforall declaration hides C function " );
                         }
                 }
 
                 // Skip repeat declarations of the same identifier
-                IdData * existing = lookupIdAtScope( name, mangleName, scope );
-                if ( existing && existing->id && addedIdConflicts( *existing, decl, deleteStmt, handleConflicts ) ) return;
+                DeclarationWithType *existing = lookupIdAtScope( name, mangleName, scope );
+                if ( existing && addedIdConflicts( existing, decl ) ) return;
 
                 // add to indexer
-                tables->idTable[ name ][ mangleName ] = { decl, baseExpr, deleteStmt };
+                tables->idTable[ name ][ mangleName ] = { decl, baseExpr };
                 ++tables->size;
-        }
-
-        void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
-                // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( msg, decl ); return true; }, baseExpr );
-        }
-
-        void Indexer::addDeletedId( DeclarationWithType * decl, BaseSyntaxNode * deleteStmt ) {
-                // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { throw SemanticError( msg, decl ); return true; }, nullptr, deleteStmt );
         }
 
@@ -477 +455 @@
                         return true;
                 } else {
-                        throw SemanticError( "redeclaration of ", added );
+                        throw SemanticError( added, "redeclaration of " );
                 }
         }
@@ -504 +482 @@
                         return false;
                 } else if ( ! added->get_members().empty() ) {
-                        throw SemanticError( "redeclaration of ", added );
+                        throw SemanticError( added, "redeclaration of " );
                 } // if
                 return true;
@@ -595 +573 @@
         }
 
-        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction handleConflicts ) {
+        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr ) {
                 for ( Declaration * decl : aggr->members ) {
                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                addId( dwt, handleConflicts, expr );
+                                addId( dwt, expr );
                                 if ( dwt->name == "" ) {
                                         Type * t = dwt->get_type()->stripReferences();
@@ -604 +582 @@
                                                 Expression * base = expr->clone();
                                                 ResolvExpr::referenceToRvalueConversion( base );
-                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ), handleConflicts );
+                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ) );
                                         }
                                 }
@@ -611 +589 @@
         }
 
-        void Indexer::addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt ) {
+        void Indexer::addWith( std::list< Expression * > & withExprs ) {
                 for ( Expression * expr : withExprs ) {
                         if ( expr->result ) {
@@ -617 +595 @@
                                 assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
 
-                                addMembers( aggr, expr, [withStmt](IdData & existing, const std::string &) {
-                                        // on conflict, delete the identifier
-                                        existing.deleteStmt = withStmt;
-                                        return true;
-                                });
+                                addMembers( aggr, expr );
                         }
                 }
@@ -680 +654 @@
 
         void Indexer::print( std::ostream &os, int indent ) const {
-                using std::cerr;
+            using std::cerr;
 
                 if ( tables ) {
@@ -706 +680 @@
 
         Expression * Indexer::IdData::combine() const {
-                Expression * ret = nullptr;
                 if ( baseExpr ) {
                         Expression * base = baseExpr->clone();
                         ResolvExpr::referenceToRvalueConversion( base );
-                        ret = new MemberExpr( id, base );
+                        Expression * ret = new MemberExpr( id, base );
                         // xxx - this introduces hidden environments, for now remove them.
                         // std::swap( base->env, ret->env );
                         delete base->env;
                         base->env = nullptr;
-                } else {
-                        ret = new VariableExpr( id );
-                }
-                if ( deleteStmt ) ret = new DeletedExpr( ret, deleteStmt );
-                return ret;
+                        return ret;
+                } else {
+                        return new VariableExpr( id );
+                }
         }
 } // namespace SymTab