Changeset 67b1180
- Timestamp:
- Apr 22, 2016, 3:31:05 PM (8 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 845cedc
- Parents:
- fbfb38e (diff), 743fbda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/SymTab/Indexer.cc
rfbfb38e r67b1180 5 5 // file "LICENCE" distributed with Cforall. 6 6 // 7 // Indexer.cc -- 7 // Indexer.cc -- 8 8 // 9 9 // Author : Richard C. Bilson 10 10 // Created On : Sun May 17 21:37:33 2015 11 // Last Modified By : Peter A. Buhr12 // Last Modified On : Wed Mar 2 17:31:29201611 // Last Modified By : Rob Schluntz 12 // Last Modified On : Fri Apr 22 15:25:43 2016 13 13 // Update Count : 11 14 14 // … … 59 59 } 60 60 } 61 61 62 62 template< typename Decl > 63 63 void dump( const std::unordered_map< std::string, Decl* > &table, std::ostream &os ) { … … 66 66 } // for 67 67 } 68 68 69 69 struct Indexer::Impl { 70 70 Impl( unsigned long _scope ) : refCount(1), scope( _scope ), size( 0 ), base(), … … 76 76 unsigned long size; ///< Number of elements stored in this table 77 77 const Indexer base; ///< Base indexer this extends 78 78 79 79 IdTable idTable; ///< Identifier namespace 80 80 TypeTable typeTable; ///< Type namespace … … 213 213 void Indexer::visit( StructDecl *aggregateDecl ) { 214 214 // make up a forward declaration and add it before processing the members 215 StructDecl fwdDecl( aggregateDecl->get_name() ); 215 // needs to be on the heap because addStruct saves the pointer 216 StructDecl &fwdDecl = *new StructDecl( aggregateDecl->get_name() ); 216 217 cloneAll( aggregateDecl->get_parameters(), fwdDecl.get_parameters() ); 217 218 debugPrint( "Adding fwd decl for struct " << fwdDecl.get_name() << std::endl ); 218 219 addStruct( &fwdDecl ); 219 220 220 221 enterScope(); 221 222 acceptAll( aggregateDecl->get_parameters(), *this ); 222 223 acceptAll( aggregateDecl->get_members(), *this ); 223 224 leaveScope(); 224 225 225 226 debugPrint( "Adding struct " << aggregateDecl->get_name() << std::endl ); 226 227 // this addition replaces the forward declaration … … 234 235 debugPrint( "Adding fwd decl for union " << fwdDecl.get_name() << std::endl ); 235 236 addUnion( &fwdDecl ); 236 237 237 238 enterScope(); 238 239 acceptAll( aggregateDecl->get_parameters(), *this ); 239 240 acceptAll( aggregateDecl->get_members(), *this ); 240 241 leaveScope(); 241 242 242 243 debugPrint( "Adding union " << aggregateDecl->get_name() << std::endl ); 243 244 addUnion( aggregateDecl ); … … 256 257 acceptAll( aggregateDecl->get_members(), *this ); 257 258 leaveScope(); 258 259 259 260 debugPrint( "Adding context " << aggregateDecl->get_name() << std::endl ); 260 261 addTrait( aggregateDecl ); … … 438 439 } 439 440 440 441 441 442 442 443 void Indexer::lookupId( const std::string &id, std::list< DeclarationWithType* > &out ) const { 443 444 std::unordered_set< std::string > foundMangleNames; 444 445 445 446 Indexer::Impl *searchTables = tables; 446 447 while ( searchTables ) { … … 452 453 // mark the mangled name as found, skipping this insertion if a declaration for that name has already been found 453 454 if ( foundMangleNames.insert( decl->first ).second == false ) continue; 454 455 455 456 out.push_back( decl->second ); 456 457 } 457 458 } 458 459 459 460 // get declarations from base indexers 460 461 searchTables = searchTables->base.tables; … … 519 520 const MangleTable &mangleTable = decls->second; 520 521 for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) { 521 // check for C decls with the same name, skipping 522 // check for C decls with the same name, skipping 522 523 // those with a compatible type (by mangleName) 523 524 if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true; … … 527 528 return tables->base.hasIncompatibleCDecl( id, mangleName, scope ); 528 529 } 529 530 530 531 NamedTypeDecl *Indexer::lookupTypeAtScope( const std::string &id, unsigned long scope ) const { 531 532 if ( ! tables ) return 0; … … 535 536 return ret != tables->typeTable.end() ? ret->second : tables->base.lookupTypeAtScope( id, scope ); 536 537 } 537 538 538 539 StructDecl *Indexer::lookupStructAtScope( const std::string &id, unsigned long scope ) const { 539 540 if ( ! tables ) return 0; … … 543 544 return ret != tables->structTable.end() ? ret->second : tables->base.lookupStructAtScope( id, scope ); 544 545 } 545 546 546 547 EnumDecl *Indexer::lookupEnumAtScope( const std::string &id, unsigned long scope ) const { 547 548 if ( ! tables ) return 0; … … 551 552 return ret != tables->enumTable.end() ? ret->second : tables->base.lookupEnumAtScope( id, scope ); 552 553 } 553 554 554 555 UnionDecl *Indexer::lookupUnionAtScope( const std::string &id, unsigned long scope ) const { 555 556 if ( ! tables ) return 0; … … 559 560 return ret != tables->unionTable.end() ? ret->second : tables->base.lookupUnionAtScope( id, scope ); 560 561 } 561 562 562 563 TraitDecl *Indexer::lookupTraitAtScope( const std::string &id, unsigned long scope ) const { 563 564 if ( ! tables ) return 0; … … 602 603 return true; 603 604 } 604 605 605 606 void Indexer::addId( DeclarationWithType *decl ) { 606 607 makeWritable(); … … 621 622 if ( decl->get_linkage() == LinkageSpec::C && hasIncompatibleCDecl( name, mangleName, scope ) ) { 622 623 throw SemanticError( "invalid overload of C function ", decl ); 623 } // NOTE this is broken in Richard's original code in such a way that it never triggers (it 624 // doesn't check decls that have the same manglename, and all C-linkage decls are defined to 624 } // NOTE this is broken in Richard's original code in such a way that it never triggers (it 625 // doesn't check decls that have the same manglename, and all C-linkage decls are defined to 625 626 // have their name as their manglename, hence the error can never trigger). 626 // The code here is closer to correct, but name mangling would have to be completely 627 // The code here is closer to correct, but name mangling would have to be completely 627 628 // isomorphic to C type-compatibility, which it may not be. 628 629 629 630 tables->idTable[ name ][ mangleName ] = decl; 630 631 ++tables->size; … … 641 642 } 642 643 } 643 644 644 645 void Indexer::addType( NamedTypeDecl *decl ) { 645 646 makeWritable(); … … 672 673 addStruct( new StructDecl( id ) ); 673 674 } 674 675 675 676 void Indexer::addStruct( StructDecl *decl ) { 676 677 makeWritable(); … … 690 691 } 691 692 } 692 693 693 694 void Indexer::addEnum( EnumDecl *decl ) { 694 695 makeWritable(); … … 712 713 addUnion( new UnionDecl( id ) ); 713 714 } 714 715 715 716 void Indexer::addUnion( UnionDecl *decl ) { 716 717 makeWritable(); … … 730 731 } 731 732 } 732 733 733 734 void Indexer::addTrait( TraitDecl *decl ) { 734 735 makeWritable(); … … 751 752 void Indexer::enterScope() { 752 753 ++scope; 753 754 754 755 if ( doDebug ) { 755 756 std::cout << "--- Entering scope " << scope << std::endl; … … 804 805 os << "--- end ---" << std::endl; 805 806 } 806 807 807 808 } 808 809 } // namespace SymTab
Note: See TracChangeset
for help on using the changeset viewer.