From 557386cedf9a58d5d3ad6457757e281bbbe6a2cc Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Wed, 27 Apr 2011 10:59:14 +0900 Subject: [PATCH] fixing break in cut introduced by syntax-rules tweak --- lib/init.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/init.scm b/lib/init.scm index 728e51da..a6f39246 100644 --- a/lib/init.scm +++ b/lib/init.scm @@ -632,8 +632,7 @@ (dim 0) (vars '()) (k (lambda (vars) - (or (expand-template tmpl vars) - (list _begin #f))))) + (list _cons (expand-template tmpl vars) #f)))) (let ((v (next-symbol "v."))) (list _let (list (list v x)) @@ -797,19 +796,22 @@ (else (list _cons (lp (car t) dim) (lp (cdr t) dim))))) ((vector? t) (list _list->vector (lp (vector->list t) dim))) ((null? t) (list _quote '())) - ((not t) (list _quote (list _quote #f))) (else t)))) (list _er-macro-transformer (list _lambda (list _expr _rename _compare) - (cons - _or - (append - (map - (lambda (clause) (expand-pattern (car clause) (cadr clause))) - forms) - (list (list _error "no expansion for" - (list (rename 'strip-syntactic-closures) _expr))))))))))) + (list + _car + (cons + _or + (append + (map + (lambda (clause) (expand-pattern (car clause) (cadr clause))) + forms) + (list _cons + (list _error "no expansion for" + (list (rename 'strip-syntactic-closures) _expr)) + #f)))))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; additional syntax