Changes in src/SymTab/Indexer.cc [ac57659:5fe35d6]

File:

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

src/SymTab/Indexer.cc

@@ -40 +40 @@
 
 namespace SymTab {
-        std::ostream & operator<<( std::ostream & out, const Indexer::IdData & data ) {
-                return out << "(" << data.id << "," << data.baseExpr << ")";
-        }
-
-        typedef std::unordered_map< std::string, Indexer::IdData > MangleTable;
+        typedef std::unordered_map< std::string, DeclarationWithType* > MangleTable;
         typedef std::unordered_map< std::string, MangleTable > IdTable;
         typedef std::unordered_map< std::string, NamedTypeDecl* > TypeTable;
@@ -101 +97 @@
         }
 
-        void Indexer::removeSpecialOverrides( const std::string &id, std::list< IdData > & out ) const {
+        void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
                 // only need to perform this step for constructors, destructors, and assignment functions
                 if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
@@ -108 +104 @@
                 struct ValueType {
                         struct DeclBall {
-                                IdData decl;
+                                FunctionDecl * decl;
                                 bool isUserDefinedFunc; // properties for this particular decl
                                 bool isDefaultCtor;
@@ -124 +120 @@
                         // another FunctionDecl for the current type was found - determine
                         // if it has special properties and update data structure accordingly
-                        ValueType & operator+=( IdData data ) {
-                                DeclarationWithType * function = data.id;
+                        ValueType & operator+=( FunctionDecl * function ) {
                                 bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
                                 bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
                                 bool isDtor = InitTweak::isDestructor( function );
                                 bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
-                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
+                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
                                 existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
                                 existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
@@ -140 +135 @@
                 }; // ValueType
 
-                std::list< IdData > copy;
+                std::list< DeclarationWithType * > copy;
                 copy.splice( copy.end(), out );
 
                 // organize discovered declarations by type
                 std::unordered_map< std::string, ValueType > funcMap;
-                for ( auto decl : copy ) {
-                        if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl.id ) ) {
+                for ( DeclarationWithType * decl : copy ) {
+                        if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl ) ) {
                                 std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
                                 assert( ! params.empty() );
@@ -152 +147 @@
                                 Type * base = InitTweak::getPointerBase( params.front()->get_type() );
                                 assert( base );
-                                funcMap[ Mangler::mangle( base ) ] += decl;
+                                funcMap[ Mangler::mangle( base ) ] += function;
                         } else {
                                 out.push_back( decl );
@@ -169 +164 @@
                                 bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
                                 bool isUserDefinedFunc = ball.isUserDefinedFunc;
-                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl.id->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
+                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
                                 bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
                                 bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
@@ -224 +219 @@
         }
 
-        void Indexer::lookupId( const std::string &id, std::list< IdData > &out ) const {
+        void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const {
                 std::unordered_set< std::string > foundMangleNames;
 
@@ -294 +289 @@
                         const MangleTable &mangleTable = decls->second;
                         MangleTable::const_iterator decl = mangleTable.find( mangleName );
-                        if ( decl != mangleTable.end() ) return decl->second.id;
+                        if ( decl != mangleTable.end() ) return decl->second;
                 }
 
@@ -309 +304 @@
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
                                 // check for C decls with the same name, skipping those with a compatible type (by mangleName)
-                                if ( ! LinkageSpec::isMangled( decl->second.id->get_linkage() ) && decl->first != mangleName ) return true;
+                                if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first != mangleName ) return true;
                         }
                 }
@@ -326 +321 @@
                                 // check for C decls with the same name, skipping
                                 // those with an incompatible type (by mangleName)
-                                if ( ! LinkageSpec::isMangled( decl->second.id->get_linkage() ) && decl->first == mangleName ) return true;
+                                if ( ! LinkageSpec::isMangled( decl->second->get_linkage() ) && decl->first == mangleName ) return true;
                         }
                 }
@@ -408 +403 @@
         }
 
-        void Indexer::addId( DeclarationWithType *decl, Expression * baseExpr ) {
+        void Indexer::addId( DeclarationWithType *decl ) {
                 debugPrint( "Adding Id " << decl->name << std::endl );
                 makeWritable();
@@ -444 +439 @@
 
                 // add to indexer
-                tables->idTable[ name ][ mangleName ] = { decl, baseExpr };
+                tables->idTable[ name ][ mangleName ] = decl;
                 ++tables->size;
         }
@@ -568 +563 @@
                         if ( ! addedDeclConflicts( existing->second, decl ) ) {
                                 existing->second = decl;
-                        }
-                }
-        }
-
-        void Indexer::addWith( WithStmt * stmt ) {
-                for ( Expression * expr : stmt->exprs ) {
-                        if ( expr->result ) {
-                                AggregateDecl * aggr = expr->result->stripReferences()->getAggr();
-                                assertf( aggr, "WithStmt expr has non-aggregate type: %s", toString( expr->result ).c_str() );
-
-                                for ( Declaration * decl : aggr->members ) {
-                                        if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
-                                                addId( dwt, expr );
-                                        }
-                                }
                         }
                 }
@@ -665 +645 @@
 
         }
-
-        Expression * Indexer::IdData::combine() const {
-                if ( baseExpr ) {
-                        Expression * base = baseExpr->clone();
-                        ResolvExpr::referenceToRvalueConversion( 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;
-                        return ret;
-                } else {
-                        return new VariableExpr( id );
-                }
-        }
 } // namespace SymTab