Changes in src/GenPoly/ScopedMap.h [933667d:0531b5d]

File:

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

src/GenPoly/ScopedMap.h

@@ -17 +17 @@
 #define _SCOPEDMAP_H
 
+#include <cassert>
 #include <iterator>
 #include <map>
@@ -164 +165 @@
                 void endScope() {
                         scopes.pop_back();
+                        assert( ! scopes.empty() );
                 }
 
@@ -188 +190 @@
                         return end();
                 }
-                const_iterator find( const Key &key ) const { return const_iterator( find( key ) ); }
+                const_iterator find( const Key &key ) const {
+                                return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->find( key ) );
+                }
                 
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
@@ -200 +204 @@
                         return end();
                 }
-                const_iterator findNext( const_iterator &it, const Key &key ) const { return const_iterator( findNext( it, key ) ); }
+                const_iterator findNext( const_iterator &it, const Key &key ) const {
+                                return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->findNext( it, key ) );
+                }
 
                 /// Inserts the given key-value pair into the outermost scope
@@ -208 +214 @@
                 }
                 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;
+                }
         };
 } // namespace GenPoly