---

yaml
---
r: 41799
b: refs/heads/master
c: a73f4b1
h: refs/heads/master
i:
  41797: a0885c4
  41795: 1e57701
  41791: 8469c24
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d44084e10084c1f442f8eb8932590c252eb6df85
+refs/heads/master: a73f4b1baa3533956582ec9892cc4d1780e45ed0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libstd/treemap.rs

@@ -279,15 +279,45 @@ impl <T: Ord> TreeSet<T> {
 
     /// Visit the values (in-order) representing the symmetric difference
     pure fn symmetric_difference(&self, other: &TreeSet<T>,
-                                 _f: fn(&T) -> bool) {
+                                 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 {
+                        if !f(b1) { return }
+                    } else {
+                        a = x.next();
+                    }
+                    b = y.next();
+                }
+            }
+            while b.is_some() {
+                let (b1, _) = b.unwrap();
+                if !f(b1) { return }
+                b = y.next();
+            }
         }
-        fail ~"not yet implemented"
     }
 
     /// Visit the values (in-order) representing the intersection
@@ -895,6 +925,32 @@ mod test_set {
         assert i == expected.len();
     }
 
+    #[test]
+    fn test_symmetric_difference() {
+        let mut a = TreeSet::new();
+        let mut b = TreeSet::new();
+
+        assert a.insert(1);
+        assert a.insert(3);
+        assert a.insert(5);
+        assert a.insert(9);
+        assert a.insert(11);
+
+        assert b.insert(-2);
+        assert b.insert(3);
+        assert b.insert(9);
+        assert b.insert(14);
+        assert b.insert(22);
+
+        let mut i = 0;
+        let expected = [-2, 1, 5, 11, 14, 22];
+        for a.symmetric_difference(&b) |x| {
+            assert *x == expected[i];
+            i += 1
+        }
+        assert i == expected.len();
+    }
+
     #[test]
     fn test_union() {
         let mut a = TreeSet::new();