fix bug in commit 52f18ee37

This commit is contained in:
Robby Findler 2012-08-17 17:54:26 -05:00
parent 52f18ee370
commit b128ce4719

View File

@ -1191,7 +1191,8 @@
(let ([exprs (map (lambda (e) (let ([exprs (map (lambda (e)
(syntax-case e () (syntax-case e ()
[(d-v (id ...) expr) [(d-v (id ...) expr)
(free-identifier=? #'d-v #'define-values) (and (identifier? #'d-v)
(free-identifier=? #'d-v #'define-values))
(syntax-track-origin (syntax/loc e (set!-values (id ...) expr)) (syntax-track-origin (syntax/loc e (set!-values (id ...) expr))
e e
#'d-v)] #'d-v)]
@ -1224,7 +1225,8 @@
e e
#'_init)))] #'_init)))]
[(-fld orig idp ...) [(-fld orig idp ...)
(free-identifier=? #'-fld #'-field) (and (identifier? #'-fld)
(free-identifier=? #'-fld #'-field))
(with-syntax ([(((iid eid) expr) ...) (with-syntax ([(((iid eid) expr) ...)
(map normalize-init/field (syntax->list #'(idp ...)))]) (map normalize-init/field (syntax->list #'(idp ...)))])
(syntax-track-origin (syntax-track-origin
@ -1235,7 +1237,8 @@
e e
#'-fld))] #'-fld))]
[(-i-r id/rename) [(-i-r id/rename)
(free-identifier=? #'-i-r #'-init-rest) (and (identifier? #'-i-r)
(free-identifier=? #'-i-r #'-init-rest))
(with-syntax ([n (+ (length plain-inits) (with-syntax ([n (+ (length plain-inits)
(length plain-init-fields) (length plain-init-fields)
-1)] -1)]
@ -1247,7 +1250,8 @@
e e
#'-i-r))] #'-i-r))]
[(-i-r) [(-i-r)
(free-identifier=? #'-i-r #'-init-rest) (and (identifier? #'-i-r)
(free-identifier=? #'-i-r #'-init-rest))
(syntax-track-origin (syntax (void)) e #'-i-r)] (syntax-track-origin (syntax (void)) e #'-i-r)]
[_else e])) [_else e]))
exprs)] exprs)]