Changeset 933667d

Timestamp:

Jan 13, 2016, 5:00:46 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

1194734

Parents:

52bbd67

Message:

Bugfixes for ScopedMap?

File:

• src/GenPoly/ScopedMap.h (modified) (2 diffs)

src/GenPoly/ScopedMap.h

@@ -176 +176 @@
                 const_iterator cend() const { return const_iterator(scopes, scopes[0].end(), 0); }
 
+                /// Gets the index of the current scope (counted from 1)
+                size_type currentScope() const { return scopes.size(); }
+
                 /// Finds the given key in the outermost scope it occurs; returns end() for none such
                 iterator find( const Key &key ) {
-                        for ( size_type i = scopes.size() - 1; i > 0; --i ) {
+                        for ( size_type i = scopes.size() - 1; ; --i ) {
                                 typename Scope::iterator val = scopes[i].find( key );
                                 if ( val != scopes[i].end() ) return iterator( scopes, val, i );
+                                if ( i == 0 ) break;
                         }
                         return end();
@@ -189 +193 @@
                 iterator findNext( const_iterator &it, const Key &key ) {
                         if ( it.i == 0 ) return end();
-                        for ( size_type i = it.i - 1; i > 0; --i ) {
+                        for ( size_type i = it.i - 1; ; --i ) {
                                 typename Scope::iterator val = scopes[i].find( key );
                                 if ( val != scopes[i].end() ) return iterator( scopes, val, i );
+                                if ( i == 0 ) break;
                         }
                         return end();