Merge pull request #19 from varkor/vars_since_snapshot

Add a `values_since_snapshot` method to `UnificationStore`

Author: nikomatsakis

src/snapshot_vec.rs

@@ -61,7 +61,7 @@ impl<D> fmt::Debug for SnapshotVec<D>
 // Snapshots are tokens that should be created/consumed linearly.
 pub struct Snapshot {
     // Length of the undo log at the time the snapshot was taken.
-    length: usize,
+    pub(crate) length: usize,
 }
 
 pub trait SnapshotVecDelegate {

src/unify/backing_vec.rs

@@ -2,6 +2,7 @@
 use dogged::DVec;
 use snapshot_vec as sv;
 use std::ops;
+use std::ops::RangeInclusive;
 use std::marker::PhantomData;
 
 use super::{VarValue, UnifyKey, UnifyValue};
@@ -10,29 +11,35 @@ use super::{VarValue, UnifyKey, UnifyValue};
 #[allow(type_alias_bounds)]
 type Key<S: UnificationStore> = <S as UnificationStore>::Key;
 
+pub trait Measurable {
+    fn len(&self) -> usize;
+}
+
 /// Largely internal trait implemented by the unification table
 /// backing store types. The most common such type is `InPlace`,
 /// which indicates a standard, mutable unification table.
 pub trait UnificationStore:
-    ops::Index<usize, Output = VarValue<Key<Self>>> + Clone + Default
+    ops::Index<usize, Output = VarValue<Key<Self>>> + Measurable + Clone + Default
 {
     type Key: UnifyKey<Value = Self::Value>;
     type Value: UnifyValue;
-    type Snapshot;
+    type Snapshot: Measurable;
 
     fn start_snapshot(&mut self) -> Self::Snapshot;
 
     fn rollback_to(&mut self, snapshot: Self::Snapshot);
 
     fn commit(&mut self, snapshot: Self::Snapshot);
 
+    fn values_since_snapshot(&mut self, snapshot: &Self::Snapshot) -> RangeInclusive<usize> {
+        snapshot.len()..=self.len()
+    }
+
     fn reset_unifications(
         &mut self,
         value: impl FnMut(u32) -> VarValue<Self::Key>,
     );
 
-    fn len(&self) -> usize;
-
     fn push(&mut self, value: VarValue<Self::Key>);
 
     fn reserve(&mut self, num_new_values: usize);
@@ -59,6 +66,20 @@ impl<K: UnifyKey> Default for InPlace<K> {
     }
 }
 
+impl Measurable for sv::Snapshot {
+    #[inline]
+    fn len(&self) -> usize {
+        self.length
+    }
+}
+
+impl<K: UnifyKey> Measurable for InPlace<K> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.values.len()
+    }
+}
+
 impl<K: UnifyKey> UnificationStore for InPlace<K> {
     type Key = K;
     type Value = K::Value;
@@ -87,11 +108,6 @@ impl<K: UnifyKey> UnificationStore for InPlace<K> {
         self.values.set_all(|i| value(i as u32));
     }
 
-    #[inline]
-    fn len(&self) -> usize {
-        self.values.len()
-    }
-
     #[inline]
     fn push(&mut self, value: VarValue<Self::Key>) {
         self.values.push(value);
@@ -143,6 +159,14 @@ impl<K: UnifyKey> Default for Persistent<K> {
     }
 }
 
+#[cfg(feature = "persistent")]
+impl<K: UnifyKey> Measurable for Persistent<K> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.values.len()
+    }
+}
+
 #[cfg(feature = "persistent")]
 impl<K: UnifyKey> UnificationStore for Persistent<K> {
     type Key = K;
@@ -176,11 +200,6 @@ impl<K: UnifyKey> UnificationStore for Persistent<K> {
         }
     }
 
-    #[inline]
-    fn len(&self) -> usize {
-        self.values.len()
-    }
-
     #[inline]
     fn push(&mut self, value: VarValue<Self::Key>) {
         self.values.push(value);