---

yaml
---
r: 32500
b: refs/heads/dist-snap
c: 4ea4566
h: refs/heads/master
v: v3

Author: jld

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: e5cb6cc1237caeaa998a632c0dcf0bb067e6afef
+refs/heads/dist-snap: 4ea45669b8d5b7017acd5555163e2a15e85da46c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/vec.rs

@@ -43,6 +43,7 @@ export grow;
 export grow_fn;
 export grow_set;
 export truncate;
+export dedup;
 export map;
 export mapi;
 export map2;
@@ -625,6 +626,41 @@ fn truncate<T>(&v: ~[const T], newlen: uint) {
     }
 }
 
+/**
+ * Remove consecutive repeated elements from a vector; if the vector is
+ * sorted, this removes all duplicates.
+ */
+fn dedup<T: Eq>(&v: ~[const T]) unsafe {
+    if v.len() < 1 { return; }
+    let mut last_written = 0, next_to_read = 1;
+    do as_const_buf(v) |p, ln| {
+        // We have a mutable reference to v, so we can make arbitrary changes.
+        // (cf. push and pop)
+        let p = p as *mut T;
+        // last_written < next_to_read <= ln
+        while next_to_read < ln {
+            // last_written < next_to_read < ln
+            if *ptr::mut_offset(p, next_to_read) ==
+                *ptr::mut_offset(p, last_written) {
+                let _dropped <- *ptr::mut_offset(p, next_to_read);
+            } else {
+                last_written += 1;
+                // last_written <= next_to_read < ln
+                if next_to_read != last_written {
+                    *ptr::mut_offset(p, last_written) <-
+                        *ptr::mut_offset(p, next_to_read);
+                }
+            }
+            // last_written <= next_to_read < ln
+            next_to_read += 1;
+            // last_written < next_to_read <= ln
+        }
+    }
+    // last_written < next_to_read == ln
+    unsafe::set_len(v, last_written + 1);
+}
+
+
 // Appending
 #[inline(always)]
 pure fn append<T: Copy>(+lhs: ~[T], rhs: &[const T]) -> ~[T] {
@@ -2218,6 +2254,51 @@ mod tests {
         // If the unsafe block didn't drop things properly, we blow up here.
     }
 
+    #[test]
+    fn test_dedup() {
+        fn case(-a: ~[uint], -b: ~[uint]) {
+            let mut v = a;
+            dedup(v);
+            assert(v == b);
+        }
+        case(~[], ~[]);
+        case(~[1], ~[1]);
+        case(~[1,1], ~[1]);
+        case(~[1,2,3], ~[1,2,3]);
+        case(~[1,1,2,3], ~[1,2,3]);
+        case(~[1,2,2,3], ~[1,2,3]);
+        case(~[1,2,3,3], ~[1,2,3]);
+        case(~[1,1,2,2,2,3,3], ~[1,2,3]);
+    }
+
+    #[test]
+    fn test_dedup_unique() {
+        let mut v0 = ~[~1, ~1, ~2, ~3];
+        dedup(v0);
+        let mut v1 = ~[~1, ~2, ~2, ~3];
+        dedup(v1);
+        let mut v2 = ~[~1, ~2, ~3, ~3];
+        dedup(v2);
+        /*
+         * If the ~pointers were leaked or otherwise misused, valgrind and/or
+         * rustrt should raise errors.
+         */
+    }
+
+    #[test]
+    fn test_dedup_shared() {
+        let mut v0 = ~[@1, @1, @2, @3];
+        dedup(v0);
+        let mut v1 = ~[@1, @2, @2, @3];
+        dedup(v1);
+        let mut v2 = ~[@1, @2, @3, @3];
+        dedup(v2);
+        /*
+         * If the @pointers were leaked or otherwise misused, valgrind and/or
+         * rustrt should raise errors.
+         */
+    }
+
     #[test]
     fn test_map() {
         // Test on-stack map.