Changeset 21a2a7d

Timestamp:

Feb 3, 2023, 4:04:22 PM (22 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:

• Common/ScopedMap.h (modified) (2 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• Validate/ReplaceTypedef.cpp (modified) (1 diff)

src/Common/ScopedMap.h

@@ -167 +167 @@
         }
 
-        iterator erase( iterator pos );
+        /// Erases element with key in the innermost scope that has it.
+        size_type erase( const Key & key ) {
+                for ( auto it = scopes.rbegin() ; it != scopes.rend() ; ++it ) {
+                        if ( size_type i = it->map.erase( key ) ; 0 != i ) return i;
+                }
+                return 0;
+        }
 
         size_type count( const Key & key ) const {
@@ -345 +351 @@
 };
 
-template<typename Key, typename Value, typename Note>
-typename ScopedMap<Key, Value, Note>::iterator
-                ScopedMap<Key, Value, Note>::erase( iterator pos ) {
-        MapType & scope = (*pos.scopes)[ pos.level ].map;
-        const typename iterator::wrapped_iterator & new_it = scope.erase( pos.it );
-        iterator it( *pos.scopes, new_it, pos.level );
-        return it.next_valid();
-}
-
 // Local Variables: //
 // tab-width: 4 //

src/SymTab/Validate.cc

@@ -863 +863 @@
 
         void ReplaceTypedef::premutate( TypeDecl * typeDecl ) {
-                TypedefMap::iterator i = typedefNames.find( typeDecl->name );
-                if ( i != typedefNames.end() ) {
-                        typedefNames.erase( i ) ;
-                } // if
-
+                typedefNames.erase( typeDecl->name );
                 typedeclNames.insert( typeDecl->name, typeDecl );
         }

src/Validate/ReplaceTypedef.cpp

@@ -186 +186 @@
 
 void ReplaceTypedefCore::previsit( ast::TypeDecl const * decl ) {
-        TypedefMap::iterator iter = typedefNames.find( decl->name );
-        if ( iter != typedefNames.end() ) {
-                typedefNames.erase( iter );
-        }
+        typedefNames.erase( decl->name );
         typedeclNames.insert( decl->name, decl );
 }