Add reverse iterators to std::vec

2 files changed, 57 insertions, 0 deletions

diff --git a/src/lib/vec.rs b/src/lib/vec.rs
index b6c47ac5c37..7ef0f525d74 100644
--- a/src/lib/vec.rs
+++ b/src/lib/vec.rs
@@ -664,6 +664,35 @@ fn iter2<T>(v: [mutable? T], f: block(uint, T)) {
 }
 
 /*
+Function: riter
+
+Iterates over a vector in reverse
+
+Iterates over vector `v` and, for each element, calls function `f` with the
+element's value.
+
+*/
+fn riter<T>(v: [mutable? T], f: block(T)) {
+    riter2(v) { |_i, v| f(v) }
+}
+
+/*
+Function: riter2
+
+Iterates over a vector's elements and indexes in reverse
+
+Iterates over vector `v` and, for each element, calls function `f` with the
+element's value and index.
+*/
+fn riter2<T>(v: [mutable? T], f: block(uint, T)) {
+    let i = len(v);
+    while 0u < i {
+        i -= 1u;
+        f(i, v[i]);
+    };
+}
+
+/*
 Function: to_ptr
 
 FIXME: We don't need this wrapper
diff --git a/src/test/stdtest/vec.rs b/src/test/stdtest/vec.rs
index 91220421a85..d281a697cbe 100644
--- a/src/test/stdtest/vec.rs
+++ b/src/test/stdtest/vec.rs
@@ -317,6 +317,34 @@ fn iter_nonempty() {
 }
 
 #[test]
+fn riter_empty() {
+    let i = 0;
+    vec::riter::<int>([], { |_v| i += 1 });
+    assert i == 0;
+}
+
+#[test]
+fn riter_nonempty() {
+    let i = 0;
+    vec::riter([1, 2, 3], { |v|
+        if i == 0 { assert v == 3; }
+        i += v
+                         });
+    assert i == 6;
+}
+
+#[test]
+fn riter2() {
+    let i = 0;
+    vec::riter2([0, 1, 2], { |j, v|
+        if i == 0 { assert v == 2; }
+        assert j == v as uint;
+        i += v;                   
+                          });
+    assert i == 3;
+}
+
+#[test]
 fn test_any_and_all() {
     assert (vec::any(is_three, [1u, 2u, 3u]));
     assert (!vec::any(is_three, [0u, 1u, 2u]));