Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 13:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing or patterns with different ids in branches

Browse source
This commit is contained in:
Alex Shinn 2020-08-26 16:07:52 +09:00
parent 11852c6390
commit dda71763a5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/chibi/match-test.sld
View file

@ -31,6 +31,7 @@
(test "or empty" 'ok (match '(o k) ((or) 'fail) (else 'ok))) (test "or empty" 'ok (match '(o k) ((or) 'fail) (else 'ok)))
(test "or single" 'ok (match 'ok ((or x) 'ok))) (test "or single" 'ok (match 'ok ((or x) 'ok)))
(test "or double" 'ok (match 'ok ((or (? symbol? y) y) y))) (test "or double" 'ok (match 'ok ((or (? symbol? y) y) y)))
(test "or unbalanced" 1 (match 1 ((or (and 1 x) (and 2 y)) x)))
(test "not" 'ok (match 28 ((not (a . b)) 'ok))) (test "not" 'ok (match 28 ((not (a . b)) 'ok)))
(test "pred" 'ok (match 28 ((? number?) 'ok))) (test "pred" 'ok (match 28 ((? number?) 'ok)))
(test "named pred" 29 (match 28 ((? number? x) (+ x 1)))) (test "named pred" 29 (match 28 ((? number? x) (+ x 1))))

3
lib/chibi/match/match.scm
View file

@ -531,7 +531,8 @@
(define-syntax match-gen-or (define-syntax match-gen-or
(syntax-rules () (syntax-rules ()
((_ v p g+s (sk ...) fk (i ...) ((id id-ls) ...)) ((_ v p g+s (sk ...) fk (i ...) ((id id-ls) ...))
(let ((sk2 (lambda (id ...) (sk ... (i ... id ...))))) (let ((sk2 (lambda (id ...) (sk ... (i ... id ...))))
(id (if #f #f)) ...)
(match-gen-or-step v p g+s (match-drop-ids (sk2 id ...)) fk (i ...)))))) (match-gen-or-step v p g+s (match-drop-ids (sk2 id ...)) fk (i ...))))))
(define-syntax match-gen-or-step (define-syntax match-gen-or-step