From 4219faf532dbf774cef63a9de71d3225df46f920 Mon Sep 17 00:00:00 2001 From: Tuukka Turto Date: Wed, 30 Nov 2016 23:45:21 +0200 Subject: [PATCH] Update true, false -> True, False --- hy/contrib/sequences.hy | 7 +++---- tests/native_tests/contrib/sequences.hy | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hy/contrib/sequences.hy b/hy/contrib/sequences.hy index 589b976..8b25df4 100644 --- a/hy/contrib/sequences.hy +++ b/hy/contrib/sequences.hy @@ -24,8 +24,7 @@ "initialize a new sequence with a function to compute values" (setv (. self func) func) (setv (. self cache) []) - (setv (. self high-water) -1) - nil) + (setv (. self high-water) -1)) --getitem-- (fn [self n] "get nth item of sequence" (if (hasattr n "start") @@ -43,7 +42,7 @@ --iter-- (fn [self] "create iterator for this sequence" (setv index 0) - (try (while true + (try (while True (yield (get self index)) (setv index (inc index))) (except [_ IndexError] @@ -51,7 +50,7 @@ --len-- (fn [self] "length of the sequence, dangerous for infinite sequences" (setv index (. self high-water)) - (try (while true + (try (while True (get self index) (setv index (inc index))) (except [_ IndexError] diff --git a/tests/native_tests/contrib/sequences.hy b/tests/native_tests/contrib/sequences.hy index 9cca5a8..6dd65d3 100644 --- a/tests/native_tests/contrib/sequences.hy +++ b/tests/native_tests/contrib/sequences.hy @@ -32,7 +32,7 @@ "NATIVE: test indexing sequence" (defseq shorty [n] (cond [(< n 10) n] - [true (end-sequence)])) + [True (end-sequence)])) (setv 0-to-9 (list (range 10))) (assert (= (get shorty 0) (get 0-to-9 0)) @@ -48,7 +48,7 @@ "NATIVE: test slicing sequence" (defseq shorty [n] (cond [(< n 10) n] - [true (end-sequence)])) + [True (end-sequence)])) (setv 0-to-9 (list (range 10))) (assert (= (first shorty) (first 0-to-9)) @@ -71,7 +71,7 @@ (defseq fibonacci [n] (cond [(= n 0) 0] [(= n 1) 1] - [true (+ (get fibonacci (- n 1)) + [True (+ (get fibonacci (- n 1)) (get fibonacci (- n 2)))])) (assert (= (first fibonacci) 0) @@ -102,7 +102,7 @@ "next possible prime after nth prime" (inc (get primes (dec n)))) (cond [(= n 0) 2] - [true (do (setv guess (next-possible-prime n)) + [True (do (setv guess (next-possible-prime n)) (while (divisible? guess (previous-primes n)) (setv guess (inc guess))) guess)]))