conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bugfix] guard is still broken

This commit is contained in:
Yuichi Nishiwaki 2015-07-09 04:13:35 +09:00
parent 2fb17afdfc
commit ca33c6f425
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/20.r7rs/scheme/base.scm
View File

@ -84,7 +84,8 @@
(and (list? clause) (= (length clause) 3) (equal? #'=> (list-ref clause 1)))))) (and (list? clause) (= (length clause) 3) (equal? #'=> (list-ref clause 1))))))
(if (null? clauses) (if (null? clauses)
reraise reraise
(let ((clause (car clauses))) (let ((clause (car clauses))
(rest (cdr clauses)))
(cond (cond
((else? clause) ((else? clause)
#`(begin #,@(cdr clause))) #`(begin #,@(cdr clause)))
@ -92,11 +93,13 @@
#`(let ((tmp #,(list-ref clause 0))) #`(let ((tmp #,(list-ref clause 0)))
(if tmp (if tmp
(#,(list-ref clause 2) tmp) (#,(list-ref clause 2) tmp)
(guard-aux #,reraise #,@(cdr clauses))))) (guard-aux #,reraise #,@rest))))
((= (length clause) 1)
#`(or #,(car clause) (guard-aux #,reraise #,@rest)))
(else (else
#`(if #,(car clause) #`(if #,(car clause)
(begin #,@(cdr clause)) (begin #,@(cdr clause))
(guard-aux #,reraise #,@(cdr clauses))))))))) (guard-aux #,reraise #,@rest))))))))
(define-syntax (guard formal . body) (define-syntax (guard formal . body)
(let ((var (car formal)) (let ((var (car formal))