Changeset 21a2a7d


Ignore:
Timestamp:
Feb 3, 2023, 4:04:22 PM (18 months ago)
Author:
Andrew Beach <ajbeach@…>
Branches:
ADT, ast-experimental, master
Children:
35d1de5
Parents:
e9b5043
Message:

Replaced ScopedMap::erase with a version that should avoid the order of declaration problems and also better reflects how it is actually used.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/Common/ScopedMap.h

    re9b5043 r21a2a7d  
    167167        }
    168168
    169         iterator erase( iterator pos );
     169        /// Erases element with key in the innermost scope that has it.
     170        size_type erase( const Key & key ) {
     171                for ( auto it = scopes.rbegin() ; it != scopes.rend() ; ++it ) {
     172                        if ( size_type i = it->map.erase( key ) ; 0 != i ) return i;
     173                }
     174                return 0;
     175        }
    170176
    171177        size_type count( const Key & key ) const {
     
    345351};
    346352
    347 template<typename Key, typename Value, typename Note>
    348 typename ScopedMap<Key, Value, Note>::iterator
    349                 ScopedMap<Key, Value, Note>::erase( iterator pos ) {
    350         MapType & scope = (*pos.scopes)[ pos.level ].map;
    351         const typename iterator::wrapped_iterator & new_it = scope.erase( pos.it );
    352         iterator it( *pos.scopes, new_it, pos.level );
    353         return it.next_valid();
    354 }
    355 
    356353// Local Variables: //
    357354// tab-width: 4 //
  • src/SymTab/Validate.cc

    re9b5043 r21a2a7d  
    863863
    864864        void ReplaceTypedef::premutate( TypeDecl * typeDecl ) {
    865                 TypedefMap::iterator i = typedefNames.find( typeDecl->name );
    866                 if ( i != typedefNames.end() ) {
    867                         typedefNames.erase( i ) ;
    868                 } // if
    869 
     865                typedefNames.erase( typeDecl->name );
    870866                typedeclNames.insert( typeDecl->name, typeDecl );
    871867        }
  • src/Validate/ReplaceTypedef.cpp

    re9b5043 r21a2a7d  
    186186
    187187void ReplaceTypedefCore::previsit( ast::TypeDecl const * decl ) {
    188         TypedefMap::iterator iter = typedefNames.find( decl->name );
    189         if ( iter != typedefNames.end() ) {
    190                 typedefNames.erase( iter );
    191         }
     188        typedefNames.erase( decl->name );
    192189        typedeclNames.insert( decl->name, decl );
    193190}
Note: See TracChangeset for help on using the changeset viewer.