mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-12 16:40:27 +00:00
Code Issues 1 Releases Wiki Activity

Merge pull request #1188 from primo-ppcg/if-let

Browse Source
This commit is contained in:
Calvin Rose 2023-06-11 07:21:38 -05:00 committed by GitHub
commit 7272f43191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/boot/boot.janet
View File

@ -674,21 +674,7 @@
(do (do
(def bl (in bindings i)) (def bl (in bindings i))
(def br (in bindings (+ 1 i))) (def br (in bindings (+ 1 i)))
(def atm (idempotent? bl)) (tuple 'if (tuple 'def bl br) (aux (+ 2 i)) fal))))
(def sym (if atm bl (gensym)))
(if atm
# Simple binding
(tuple 'do
(tuple 'def sym br)
(tuple 'if sym (aux (+ 2 i)) fal))
# Destructured binding
(tuple 'do
(tuple 'def sym br)
(tuple 'if sym
(tuple 'do
(tuple 'def bl sym)
(aux (+ 2 i)))
fal))))))
(aux 0)) (aux 0))
(defmacro when-let (defmacro when-let

10
test/suite-boot.janet
View File

@ -123,10 +123,12 @@
# Some higher order functions and macros # Some higher order functions and macros
# 5e2de33 # 5e2de33
(def my-array @[1 2 3 4 5 6]) (def my-array @[1 2 3 4 5 6])
(def x (if-let [x (get my-array 5)] x)) (assert (= (if-let [x (get my-array 5)] x) 6) "if-let 1")
(assert (= x 6) "if-let") (assert (= (if-let [y (get @{} :key)] 10 nil) nil) "if-let 2")
(def x (if-let [y (get @{} :key)] 10 nil)) (assert (= (if-let [a my-array k (next a)] :t :f) :t) "if-let 3")
(assert (not x) "if-let 2") (assert (= (if-let [a my-array k (next a 5)] :t :f) :f) "if-let 4")
(assert (= (if-let [[a b] my-array] a) 1) "if-let 5")
(assert (= (if-let [{:a a :b b} {:a 1 :b 2}] b) 2) "if-let 6")
(assert (= 14 (sum (map inc @[1 2 3 4]))) "sum map") (assert (= 14 (sum (map inc @[1 2 3 4]))) "sum map")
(def myfun (juxt + - * /)) (def myfun (juxt + - * /))