mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-01 08:03:02 +00:00
Code Issues 1 Releases Wiki Activity

Update match macro to test for array/tuples and table/structs.

Browse Source
This commit is contained in:
Calvin Rose
2018-12-08 11:04:19 -05:00
parent b250679789
commit bc8be266f5
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/core.janet
View File

@@ -960,21 +960,28 @@ value, one key will be ignored."
(do
(def len (length pattern))
(var i -1)
(with-idemp $arr expr
((fn aux []
(++ i)
(if (= i len)
(onmatch)
(match-1 pattern.i ~(get ,$arr ,i) aux seen))))))
(with-idemp
$arr expr
~(if (indexed? ,$arr)
,((fn aux []
(++ i)
(if (= i len)
(onmatch)
(match-1 pattern.i (tuple get $arr i) aux seen))))
,sentinel)))
(dictionary? pattern)
(do
(var key nil)
(with-idemp $dict expr ((fn aux []
(:= key (next pattern key))
(if (= key nil)
(onmatch)
(match-1 (get pattern key) ~(get ,$dict ,key) aux seen))))))
(with-idemp
$dict expr
~(if (dictionary? ,$dict)
,((fn aux []
(:= key (next pattern key))
(if (= key nil)
(onmatch)
(match-1 (get pattern key) (tuple get $dict key) aux seen))))
,sentinel)))
:else ~(if (= ,pattern ,expr) ,(onmatch) ,sentinel)))