extras/iterators: some fixes + added tests

Author: carlobaldassi

extras/iterators.jl

@@ -15,16 +15,16 @@ export
 # Infinite counting
 
 type Count
-
+    start::Any
     step::Any
 end
 
-count(start, step)           = Count(start, step)
-count{T <: Number}(start::T) = Count(start, convert(T, 1))
-count()                      = Count(0, 1)
+count(start, step) = Count(start, step)
+count(start)       = Count(start, one(start))
+count()            = Count(0, 1)
 
 start(it::Count) = it.start
-next(it::Count, state) = (state, state + 1)
+next(it::Count, state) = (state, state + it.step)
 done(it::Count, state) = false
 
 
@@ -40,13 +40,13 @@ take(xs, n) = Take(xs, n)
 start(it::Take) = (it.n, start(it.xs))
 
 function next(it::Take, state)
-    (n, xs_state) = state
-    (v, xs_state) = next(it.xs, xs_state)
-    (v, (n - 1, xs_state))
+    n, xs_state = state
+    v, xs_state = next(it.xs, xs_state)
+    return v, (n - 1, xs_state)
 end
 
 function done(it::Take, state)
-    (n, xs_state) = state
+    n, xs_state = state
     return n <= 0 || done(it.xs, xs_state)
 end
 
@@ -67,7 +67,7 @@ function start(it::Drop)
             break
         end
 
-        (_, xs_state) = next(it.xs, xs_state)
+        _, xs_state = next(it.xs, xs_state)
     end
     xs_state
 end
@@ -84,19 +84,24 @@ end
 
 cycle(xs) = Cycle(xs)
 
-start(it::Cycle) = start(it.xs)
+function start(it::Cycle)
+    s = start(it.xs)
+    return s, done(it.xs, s)
+end
 
 function next(it::Cycle, state)
-    if done(it.xs, state)
-        state = start(it.xs)
+    s, d = state
+    if done(it.xs, s)
+        s = start(it.xs)
     end
-    v = next(it.xs, state)
+    v, s = next(it.xs, s)
+    return v, (s, false)
 end
 
-done(it::Cycle, state) = false
+done(it::Cycle, state) = state[2]
 
 
-# Repeat an object n (or infinately many) times.
+# Repeat an object n (or infinitely many) times.
 
 type Repeat
     x
@@ -143,20 +148,20 @@ function start(it::Chain)
         end
         i += 1
     end
-    (i, xs_state)
+    return i, xs_state
 end
 
 function next(it::Chain, state)
     i, xs_state = state
-    (v, xs_state) = next(it.xss[i], xs_state)
+    v, xs_state = next(it.xss[i], xs_state)
     while done(it.xss[i], xs_state)
         i += 1
         if i > length(it.xss)
             break
         end
         xs_state = start(it.xss[i])
     end
-    (v, (i, xs_state))
+    return v, (i, xs_state)
 end
 
 done(it::Chain, state) = state[1] > length(it.xss)

test/Makefile

@@ -8,7 +8,8 @@ TESTS = default all extra \
 core numbers strings unicode corelib hashing \
 arrayops linalg fft sparse arpack bitarray \
 random special functional bigint dists combinatorics statistics \
-glpk linprog sparse bigfloat poly file Rmath remote zlib sound image
+glpk linprog sparse bigfloat poly file Rmath remote zlib sound image \
+iterators
 
 $(TESTS) ::
 	$(QUIET_JULIA) $(JULIA_EXECUTABLE) ./runtests.jl $@

test/extra.jl

@@ -7,5 +7,6 @@ runtests("Rmath")
 runtests("zlib")
 runtests("options")
 runtests("image")
+runtests("iterators")
 
 runtests("perf")