TreeRepr: make most of the fields private

Author: kirillkh

src/applied/interval_tree.rs

@@ -261,7 +261,7 @@ impl<Iv: Interval, V> AppliedTree<IvNode<Iv, V>> for IvTree<Iv, V> {
         let mut tree = Self::with_nodes(nodes);
 
         // initialize maxb values
-        for i in (1..tree.data.len()).rev() {
+        for i in (1..tree.capacity()).rev() {
             if !tree.is_nil(i) {
                 tree.update_parent_maxb(i);
             }

src/base/base_repr.rs

@@ -1,4 +1,4 @@
-use base::{Node, Entry, Sink, lefti, righti, parenti, SlotStack};
+use base::{Node, Entry, Sink, lefti, righti, parenti, SlotStack, Refill};
 use base::bulk_delete::DeleteRangeCache;
 use std::fmt::{Debug, Formatter};
 use std::fmt;
@@ -21,11 +21,11 @@ impl<N: Node, T> TreeDerefMut<N> for T where T: Deref<Target=TreeRepr<N>> + Dere
 
 #[derive(Clone)]
 pub struct TreeRepr<N: Node> {
-    pub data: Vec<N>,
-    pub mask: Vec<bool>,
+    data: Vec<N>,
+    mask: Vec<bool>,
     pub size: usize,
 
-    pub delete_range_cache: DeleteRangeCache,
+    delete_range_cache: DeleteRangeCache,
 }
 
 
@@ -119,14 +119,18 @@ impl<N: Node> TreeRepr<N> {
     pub fn clear(&mut self) {
         self.drop_items();
     }
+
+    pub fn capacity(&self) -> usize {
+        self.data.len()
+    }
 }
 
 
 //---- Accessors -----------------------------------------------------------------------------------
 impl<N: Node> TreeRepr<N> {
     // The caller must make sure idx is inside bounds.
     #[inline(always)]
-    fn mask(&self, idx: usize) -> bool {
+    pub fn mask(&self, idx: usize) -> bool {
         debug_assert!(idx < self.data.len());
         unsafe {
             *self.mask.get_unchecked(idx)
@@ -135,7 +139,7 @@ impl<N: Node> TreeRepr<N> {
 
     // The caller must make sure idx is inside bounds.
     #[inline(always)]
-    fn mask_mut(&mut self, idx: usize) -> &mut bool {
+    pub fn mask_mut(&mut self, idx: usize) -> &mut bool {
         debug_assert!(idx < self.data.len());
         unsafe {
             self.mask.get_unchecked_mut(idx)
@@ -674,6 +678,19 @@ impl<N: Node> TraverseMut<N> for TreeRepr<N> {}
 
 
 
+impl<N: Node> Refill for TreeRepr<N> where N::K: Copy, N::V: Copy {
+    fn refill(&mut self, master: &TreeRepr<N>) {
+        let len = self.data.len();
+        debug_assert!(len == master.data.len());
+        unsafe {
+            ptr::copy_nonoverlapping(master.data.as_ptr(), self.data.as_mut_ptr(), len);
+            ptr::copy_nonoverlapping(master.mask.as_ptr(), self.mask.as_mut_ptr(), len);
+        }
+        self.size = master.size;
+    }
+}
+
+
 /// Returns the closest subtree A enclosing `idx`, such that A is the left child (or 0 if no such
 /// node is found). `idx` is considered to enclose itself, so we return `idx` if it is the left
 /// child.

src/base/mod.rs

@@ -15,9 +15,6 @@ pub use self::drivers::*;
 pub use self::base_repr::*;
 pub use self::node::*;
 
-use std::ptr;
-
-
 pub trait Sink<T> {
     fn consume(&mut self, x: T);
 }
@@ -29,20 +26,6 @@ pub trait Refill {
 }
 
 
-
-impl<N: Node> Refill for TreeRepr<N> where N::K: Copy, N::V: Copy {
-    fn refill(&mut self, master: &TreeRepr<N>) {
-        let len = self.data.len();
-        debug_assert!(len == master.data.len());
-        unsafe {
-            ptr::copy_nonoverlapping(master.data.as_ptr(), self.data.as_mut_ptr(), len);
-            ptr::copy_nonoverlapping(master.mask.as_ptr(), self.mask.as_mut_ptr(), len);
-        }
-        self.size = master.size;
-    }
-}
-
-
 //impl<T: Clone+Item> Refill<T> for TeardownTree<T> {
 //    fn refill(&mut self, master: &TeardownTree<T>) {
 //            let len = self.data().len();
@@ -150,9 +133,9 @@ pub mod validation {
     pub fn check_integrity<N: Node>(tree: &Tree<N>) -> Result<(), isize> {
         let mut noccupied = 0;
 
-        for i in 0..tree.data.len() {
-            if tree.mask[i] {
-                if i != 0 && !tree.mask[parenti(i)] {
+        for i in 0..tree.capacity() {
+            if tree.mask(i) {
+                if i != 0 && !tree.mask(parenti(i)) {
                     return Err(i as isize);
                 }