---

yaml
---
r: 23439
b: refs/heads/master
c: dcbeebc
h: refs/heads/master
i:
  23437: 75a7b2c
  23435: 63655ab
  23431: 460013a
  23423: b499a73
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 79266c614d7fc9f3bee68f13f0ef3fbee3fda9b1
+refs/heads/master: dcbeebc801e071394874843e0e4c7509a0fb46c1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/tuple.rs

@@ -41,7 +41,7 @@ impl<A: copy, B: copy> (&[A], &[B]): ExtendedTupleOps<A,B> {
 
     fn zip() -> ~[(A, B)] {
         let (a, b) = self;
-        vec::zip(a, b)
+        vec::zip_slice(a, b)
     }
 
     fn map<C>(f: fn(A, B) -> C) -> ~[C] {

trunk/src/libcore/vec.rs

@@ -70,7 +70,7 @@ export position_elem;
 export rposition;
 export rposition_between;
 export unzip;
-export zip;
+export zip, zip_slice;
 export swap;
 export reverse;
 export reversed;
@@ -1019,14 +1019,9 @@ pure fn rposition_between<T>(v: &[T], start: uint, end: uint,
 // return a nominal record with a constraint saying that, instead of
 // returning a tuple (contingent on issue #869)
 /**
- * Convert a vector of pairs into a pair of vectors
- *
- * Returns a tuple containing two vectors where the i-th element of the first
- * vector contains the first element of the i-th tuple of the input vector,
- * and the i-th element of the second vector contains the second element
- * of the i-th tuple of the input vector.
+ * Convert a vector of pairs into a pair of vectors, by reference. As unzip().
  */
-pure fn unzip<T: copy, U: copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
+pure fn unzip_slice<T: copy, U: copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
     let mut as = ~[], bs = ~[];
     for each(v) |p| {
         let (a, b) = p;
@@ -1039,12 +1034,30 @@ pure fn unzip<T: copy, U: copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
 }
 
 /**
- * Convert two vectors to a vector of pairs
+ * Convert a vector of pairs into a pair of vectors.
  *
- * Returns a vector of tuples, where the i-th tuple contains contains the
- * i-th elements from each of the input vectors.
+ * Returns a tuple containing two vectors where the i-th element of the first
+ * vector contains the first element of the i-th tuple of the input vector,
+ * and the i-th element of the second vector contains the second element
+ * of the i-th tuple of the input vector.
  */
-pure fn zip<T: copy, U: copy>(v: &[const T], u: &[const U]) -> ~[(T, U)] {
+pure fn unzip<T,U>(+v: ~[(T, U)]) -> (~[T], ~[U]) {
+    let mut ts = ~[], us = ~[];
+    unchecked {
+        do consume(v) |_i, p| {
+            let (a,b) = p;
+            push(ts, a);
+            push(us, b);
+        }
+    }
+    (ts, us)
+}
+
+/**
+ * Convert two vectors to a vector of pairs, by reference. As zip().
+ */
+pure fn zip_slice<T: copy, U: copy>(v: &[const T], u: &[const U])
+        -> ~[(T, U)] {
     let mut zipped = ~[];
     let sz = len(v);
     let mut i = 0u;
@@ -1053,6 +1066,24 @@ pure fn zip<T: copy, U: copy>(v: &[const T], u: &[const U]) -> ~[(T, U)] {
     return zipped;
 }
 
+/**
+ * Convert two vectors to a vector of pairs.
+ *
+ * Returns a vector of tuples, where the i-th tuple contains contains the
+ * i-th elements from each of the input vectors.
+ */
+pure fn zip<T, U>(+v: ~[const T], +u: ~[const U]) -> ~[(T, U)] {
+    let mut v = v, u = u, i = len(v);
+    assert i == len(u);
+    let mut w = ~[mut];
+    while i > 0 {
+        unchecked { push(w, (pop(v),pop(u))); }
+        i -= 1;
+    }
+    unchecked { reverse(w); }
+    from_mut(w)
+}
+
 /**
  * Swaps two elements in a vector
  *