Changeset 5c14030 for src/Common/PersistentMap.h

Timestamp:

Jul 11, 2018, 4:26:22 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

d318a18

Parents:

184557e

git-author:

Aaron Moss <a3moss@…> (07/11/18 16:10:36)

git-committer:

Aaron Moss <a3moss@…> (07/11/18 16:26:22)

Message:

Persistent-array environment compiles

File:

• src/Common/PersistentMap.h (modified) (5 diffs)

src/Common/PersistentMap.h

@@ -139 +139 @@
                         case BASE: {
                                 for (const auto& entry : as<Base>()) {
-                                        gc << entry.first << entry.second;
+                                        gc.maybe_trace( entry.first, entry.second );
                                 }
                                 return;
@@ -145 +145 @@
                         case REM: {
                                 const Rem& self = as<Rem>();
-                                gc << self.base << self.key;
+                                gc << self.base;
+                                gc.maybe_trace( self.key );
                                 return;
                         }
                         case INS: case UPD: {
                                 const Ins& self = as<Ins>();
-                                gc << self.base << self.key << self.val;
+                                gc << self.base;
+                                gc.maybe_trace( self.key, self.val );
                                 return;
                         }
@@ -424 +426 @@
         }
 
+        /// Applies the function `f` to all elements of the map.
+        /// `f` should take two parameters, `const Key&` and `const Val&`.
+        template<typename F>
+        void for_each(F&& f) const {
+                for ( const auto& entry : rerooted() ) { f( entry.first, entry.second ); }
+        }
+
         /// Applies the function `f` to all elements of the map, returning a pointer to the updated map.
         /// `f` should take two parameters, `const Key&` and `Val&`, returning option<Val> filled with 
@@ -429 +438 @@
         /// NOTE: when porting to C++17, this should work fine with std::optional
         template<typename F>
-        Self* apply_to_all(F&& f) {
+        Self* mutate_each(F&& f) {
                 // reset to root and exit early if no change
                 if ( rerooted().empty() ) return this;
@@ -454 +463 @@
                 return next_edit;
         }
-
-        /// Applies the function `f` to all elements of the map.
-        /// `f` should take two parameters, `const Key&` and `const Val&`.
-        template<typename F>
-        void apply_to_all(F&& f) const {
-                for ( const auto& entry : rerooted() ) { f( entry.first, entry.second ); }
-        }
 };