Changeset 35cd219 for src/Common/ScopedMap.h

Timestamp:

Feb 14, 2017, 3:58:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

cf97ccb, efd60d67

Parents:

9bb90a86 (diff), e58dfb9 (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/Common/ScopedMap.h (modified) (1 diff)

src/Common/ScopedMap.h

@@ -230 +230 @@
         }
 
+        /// Finds the given key in the provided scope; returns end() for none such
+        iterator findAt( size_type scope, const Key& key ) {
+                typename Scope::iterator val = scopes[scope].find( key );
+                if ( val != scopes[scope].end() ) return iterator( scopes, val, scope );
+                return end();
+        }
+        const_iterator findAt( size_type scope, const Key& key ) const {
+                return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->findAt( scope, key ) );
+        }
+
         /// Finds the given key in the outermost scope inside the given scope where it occurs
         iterator findNext( const_iterator &it, const Key &key ) {