Changeset f57dd25 for src/GenPoly/ScopedSet.h

Timestamp:

May 29, 2019, 3:45:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0aedb01

Parents:

157a816 (diff), ebc0a85 (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 'cleanup-dtors'

File:

• src/GenPoly/ScopedSet.h (modified) (7 diffs)

src/GenPoly/ScopedSet.h

@@ -38 +38 @@
                 typedef typename Scope::pointer pointer;
                 typedef typename Scope::const_pointer const_pointer;
-                
+
                 class iterator : public std::iterator< std::bidirectional_iterator_tag,
                                                        value_type > {
@@ -72 +72 @@
                                 return *this;
                         }
-                        
+
                         reference operator* () { return *it; }
                         pointer operator-> () { return it.operator->(); }
@@ -104 +104 @@
                         bool operator!= (const iterator &that) { return !( *this == that ); }
 
+                        size_type get_level() const { return i; }
+
                 private:
                         scope_list const *scopes;
@@ -180 +182 @@
                         bool operator!= (const const_iterator &that) { return !( *this == that ); }
 
+                        size_type get_level() const { return i; }
+
                 private:
                         scope_list const *scopes;
@@ -185 +189 @@
                         size_type i;
                 };
-                
+
                 /// Starts a new scope
                 void beginScope() {
@@ -222 +226 @@
                         return const_iterator( const_cast< ScopedSet< Value >* >(this)->find( key ) );
                 }
-                
+
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
                 iterator findNext( const_iterator &it, const Value &key ) {
@@ -242 +246 @@
                         return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
                 }
-                
+
         };
 } // namespace GenPoly