Changeset 2ed94a9 for src/GenPoly/ErasableScopedMap.h

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/GenPoly/ErasableScopedMap.h (modified) (4 diffs)

src/GenPoly/ErasableScopedMap.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScopedMap.h --
+// ErasableScopedMap.h --
 //
 // Author           : Aaron B. Moss
@@ -51 +51 @@
         typedef typename Scope::const_pointer const_pointer;
 
-        // Both iterator types are complete bidirection iterators, defined below.
+        // Both iterator types are complete bidirectional iterators, see below.
         class iterator;
         class const_iterator;
@@ -118 +118 @@
         std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
 
+        Value& operator[] ( const Key &key ) {
+                iterator slot = find( key );
+                if ( slot != end() ) return slot->second;
+                return insert( key, Value() ).first->second;
+        }
+
         /// Marks the given element as erased from this scope inward; returns 1 for erased an element, 0 otherwise
         size_type erase( const Key &key ) {
@@ -130 +136 @@
         }
 
-        Value& operator[] ( const Key &key ) {
-                iterator slot = find( key );
-                if ( slot != end() ) return slot->second;
-                return insert( key, Value() ).first->second;
+        bool contains( const Key & key ) const {
+                return find( key ) != cend();
         }
 };