merge master

Author: mks-m

Makefile

@@ -2,7 +2,7 @@ all: help
 
 EXTERNALS=externals
 
-PYTHON ?= python2
+PYTHON ?= `env which -a python2 python2.7 | head -n1`
 PYTHONPATH=$$PYTHONPATH:$(EXTERNALS)/pypy
 
 

pixie/stdlib.pxi

@@ -3079,3 +3079,23 @@ ex: (vary-meta x assoc :foo 42)"
    :signatures [[rexegp-str opts]]}
   [regexp-str opts]
   (println (str regexp-str " " opts)))
+
+(deftype Iterate [f x]
+  IReduce
+  (-reduce [self rf init]
+    (loop [col (rest self) 
+           acc (rf init (first self))]
+      (if (reduced? acc)
+        @acc
+        (recur (rest col) (rf acc (first col))))))
+  ISeq
+  (-seq [self]
+    (cons x (lazy-seq* (fn [] (->Iterate f (f x)))))))
+
+(defn iterate
+  {:doc "Returns a lazy sequence of x, (f x), (f (f x)) etc. f must be free of
+    side-effects"
+   :signatures [[f x]]
+   :added "0.1"}
+  [f x]
+  (->Iterate f x))

tests/pixie/tests/test-stdlib.pxi

@@ -761,3 +761,9 @@
 (t/deftest test-memoize
   (let [f (memoize rand)]
     (t/assert= (f) (f))))
+
+(t/deftest test-iterate
+  (t/assert= (take 5 (iterate inc 5)) '(5 6 7 8 9))
+  (t/assert= (reduce (fn [a v] (reduced "foo")) 0 (iterate inc 1)) "foo")
+  (t/assert= (reduce (fn [a v] (if (< a 10) (+ a v) (reduced a))) 0 (iterate (partial + 2) 1)) 16))
+