Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Add support for multiple statements in sequences

Browse Source
This commit is contained in:
Tuukka Turto 2016-11-09 08:52:18 +02:00
parent 584a40d9c0
commit a7f6d1d3f7
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/contrib/sequences.rst
View File

@ -26,6 +26,7 @@ the sequence:
.. code-block:: hy .. code-block:: hy
(seq [n] (seq [n]
"sequence of 5 integers"
(cond [(< n 5) n] (cond [(< n 5) n]
[true (end-sequence)])) [true (end-sequence)]))
@ -40,6 +41,7 @@ is defined as:
.. code-block:: hy .. code-block:: hy
(defseq fibonacci [n] (defseq fibonacci [n]
"infinite sequence of fibonacci numbers"
(cond [(= n 0) 0] (cond [(= n 0) 0]
[(= n 1) 1] [(= n 1) 1]
[true (+ (get fibonacci (- n 1)) [true (+ (get fibonacci (- n 1))

8
hy/contrib/sequences.hy
View File

@ -67,11 +67,11 @@
"string representation of this sequence" "string representation of this sequence"
(.--str-- self))]) (.--str-- self))])
(defmacro seq [param seq-code] (defmacro seq [param &rest seq-code]
`(Sequence (fn ~param ~seq-code))) `(Sequence (fn ~param (do ~@seq-code))))
(defmacro defseq [seq-name param seq-code] (defmacro defseq [seq-name param &rest seq-code]
`(def ~seq-name (seq ~param ~seq-code))) `(def ~seq-name (seq ~param (do ~@seq-code))))
(defn end-sequence [] (defn end-sequence []
"raise IndexError exception to signal end of sequence" "raise IndexError exception to signal end of sequence"

24
tests/native_tests/contrib/sequences.hy
View File

@ -85,3 +85,27 @@
(assert (= (list (take 9 fibonacci)) (assert (= (list (take 9 fibonacci))
[0 1 1 2 3 5 8 13 21]) [0 1 1 2 3 5 8 13 21])
"taking 8 elements of fibonacci didn't match")) "taking 8 elements of fibonacci didn't match"))
(defn test-nested-functions []
"NATIVE: test that defining nested functions is possible"
(defseq primes [n]
"infinite sequence of prime numbers"
(defn divisible? [n prevs]
"is n divisible by any item in prevs?"
(any (map (fn [x]
(not (% n x)))
prevs)))
(defn previous-primes [n]
"previous prime numbers"
(take (dec n) primes))
(defn next-possible-prime [n]
"next possible prime after nth prime"
(inc (get primes (dec n))))
(cond [(= n 0) 2]
[true (do (setv guess (next-possible-prime n))
(while (divisible? guess (previous-primes n))
(setv guess (inc guess)))
guess)]))
(assert (= (list (take 10 primes))
[2 3 5 7 11 13 17 19 23 29])
"prime sequence didn't match"))