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

Revert and fix syntax-rules by reflecting review

Browse source
This commit is contained in:
Hamayama 2018-07-05 00:53:17 +09:00
parent fdc1f86f09
commit 216d6a8d87
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/init-7.scm
View file

@ -820,10 +820,13 @@
((null? p) (list _and (list _null? v) (k vars)))
(else (list _and (list _equal? v p) (k vars))))))))
(define ellipsis-mark?
(let ((cmp (if ellipsis-specified? eq? compare)))
(if (any (lambda (x) (cmp ellipsis x)) lits)
(if (if ellipsis-specified?
(memq ellipsis lits)
(any (lambda (x) (compare ellipsis x)) lits))
(lambda (x) #f)
(lambda (x) (cmp ellipsis x)))))
(if ellipsis-specified?
(lambda (x) (eq? ellipsis x))
(lambda (x) (compare ellipsis x)))))
(define (ellipsis-escape? x) (and (pair? x) (ellipsis-mark? (car x))))
(define (ellipsis? x)
(and (pair? x) (pair? (cdr x)) (ellipsis-mark? (cadr x))))
@ -873,11 +876,7 @@
((pair? t)
(cond
((and (ellipsis-escape? t) (not ell-esc))
(lp (if (pair? (cdr t))
(if (pair? (cddr t)) (cddr t) (cadr t))
(cdr t))
dim
#t))
(lp (if (and (pair? (cdr t)) (null? (cddr t))) (cadr t) (cdr t)) dim #t))
((and (ellipsis? t) (not ell-esc))
(let* ((depth (ellipsis-depth t))
(ell-dim (+ dim depth))