mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-25 09:47:17 +00:00
Code Issues 1 Releases Wiki Activity

Address #213 - disallow non-indexed ds for loop range.

Browse Source
This commit is contained in:
Calvin Rose 2019-12-04 08:18:54 -06:00
parent 328454729e
commit db9e431bf7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/boot.janet
View File

@ -326,6 +326,11 @@
(def ,binding ,i) (def ,binding ,i)
,body)))) ,body))))
(defn- check-indexed [x]
(if (indexed? x)
x
(error (string "expected tuple for range, got " x))))
(defn- loop1 (defn- loop1
[body head i] [body head i]
@ -355,11 +360,11 @@
(def {(+ i 2) object} head) (def {(+ i 2) object} head)
(let [rest (loop1 body head (+ i 3))] (let [rest (loop1 body head (+ i 3))]
(case verb (case verb
:range (let [[start stop step] object] :range (let [[start stop step] (check-indexed object)]
(for-template binding start stop (or step 1) < + [rest])) (for-template binding start stop (or step 1) < + [rest]))
:keys (keys-template binding object false [rest]) :keys (keys-template binding object false [rest])
:pairs (keys-template binding object true [rest]) :pairs (keys-template binding object true [rest])
:down (let [[start stop step] object] :down (let [[start stop step] (check-indexed object)]
(for-template binding start stop (or step 1) > - [rest])) (for-template binding start stop (or step 1) > - [rest]))
:in (each-template binding object [rest]) :in (each-template binding object [rest])
:iterate (iterate-template binding object rest) :iterate (iterate-template binding object rest)
@ -416,6 +421,7 @@
(loop1 body head 0)) (loop1 body head 0))
(put _env 'loop1 nil) (put _env 'loop1 nil)
(put _env 'check-indexed nil)
(put _env 'for-template nil) (put _env 'for-template nil)
(put _env 'iterate-template nil) (put _env 'iterate-template nil)
(put _env 'each-template nil) (put _env 'each-template nil)