---

yaml
---
r: 42460
b: refs/heads/try
c: 670748e
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 3b3ecc9ffccb4fb8dd36d39339432c36e6f68fd1
+refs/heads/try: 670748e383dfedb6ee6fe94dfad313ce8e7e5688
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libstd/treemap.rs

@@ -243,20 +243,46 @@ impl <T: Ord> TreeSet<T> {
     }
 
     /// Visit the values (in-order) representing the difference
-    pure fn difference(&self, _other: &TreeSet<T>,
-                       _f: fn(&T) -> bool) {
-        fail ~"not yet implemented" // TODO
+    pure fn difference(&self, other: &TreeSet<T>, f: fn(&T) -> bool) {
+        unsafe { // purity workaround
+            let mut x = self.map.iter();
+            let mut y = other.map.iter();
+
+            let mut a = x.next();
+            let mut b = y.next();
+
+            while a.is_some() {
+                if b.is_none() {
+                    while a.is_some() {
+                        let (a1, _) = a.unwrap();
+                        if !f(a1) { return }
+                        a = x.next();
+                    }
+                    return
+                }
+
+                let (a1, _) = a.unwrap();
+                let (b1, _) = b.unwrap();
+
+                if a1 < b1 {
+                    if !f(a1) { return }
+                    a = x.next();
+                } else {
+                    if !(b1 < a1) { a = x.next() }
+                    b = y.next();
+                }
+            }
+        }
     }
 
     /// Visit the values (in-order) representing the symmetric difference
     pure fn symmetric_difference(&self, _other: &TreeSet<T>,
                                  _f: fn(&T) -> bool) {
-        fail ~"not yet implemented" // TODO
+        fail ~"not yet implemented"
     }
 
     /// Visit the values (in-order) representing the intersection
-    pure fn intersection(&self, other: &TreeSet<T>,
-                         f: fn(&T) -> bool) {
+    pure fn intersection(&self, other: &TreeSet<T>, f: fn(&T) -> bool) {
         // FIXME: this is a naive O(n*log(m)) implementation, could be O(n)
         for self.each |x| {
             if other.contains(x) {
@@ -267,7 +293,7 @@ impl <T: Ord> TreeSet<T> {
 
     /// Visit the values (in-order) representing the union
     pure fn union(&self, _other: &TreeSet<T>, _f: fn(&T) -> bool) {
-        fail ~"not yet implemented" // TODO
+        fail ~"not yet implemented"
     }
 }
 
@@ -806,4 +832,28 @@ mod test_set {
         }
         assert i == expected.len();
     }
+
+    #[test]
+    fn test_difference() {
+        let mut a = TreeSet::new();
+        let mut b = TreeSet::new();
+
+        a.insert(1);
+        a.insert(3);
+        a.insert(5);
+        a.insert(9);
+        a.insert(11);
+
+        b.insert(3);
+        b.insert(9);
+
+        let mut i = 0;
+        let expected = [1, 5, 11];
+        for a.difference(&b) |x| {
+            io::println(fmt!("%?", x));
+            assert *x == expected[i];
+            i += 1
+        }
+        assert i == expected.len();
+    }
 }