Skip to content

fix interpretation of defsetf lambda lists #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
enometh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix interpretation of defsetf lambda lists #348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions lib/setf.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,9 @@
(unless (verify-lambda-list lambda-list)
(signal-program-error $XBadLambdaList lambda-list))
(let* ((store-vars (cons store-var mv-store-vars)))
(multiple-value-bind (lambda-list lambda-temps lambda-vars)
(rename-lambda-vars lambda-list)
(multiple-value-bind (bindings lambda-temps)
(%destructure-lambda-list lambda-list 'expression nil nil :use-whole-var t)
(setq bindings (nreverse bindings))
(multiple-value-bind (body decls doc)
(parse-body body env t)
(setq body `((block ,access-fn ,@body)))
Expand All @@ -234,25 +235,27 @@
',access-fn
#'(lambda (,access-form ,environment)
(declare (ignore ,environment))
(do* ((,args (cdr ,access-form) (cdr ,args))
(do* ((expression (cdr ,access-form))
(,args (cdr ,access-form) (cdr ,args))
(,dummies nil (cons (gensym) ,dummies))
(,newval-vars (mapcar #'(lambda (v) (declare (ignore v)) (gensym)) ',store-vars))
(,new-access-form nil))
((atom ,args)
(let* ,bindings
,@(when lambda-temps `((declare ,@lambda-temps))) ; preserving bogus bug
(setq ,new-access-form
(cons (car ,access-form) ,dummies))
(destructuring-bind ,(append lambda-vars store-vars )
`,(append ',lambda-temps ,newval-vars)
(destructuring-bind ,(append store-vars )
`,(append ,newval-vars)
,@decls
(values
,dummies
(cdr ,access-form)
,newval-vars
`((lambda ,,lambda-list
,',@ignorable
,,@body)
,@,dummies)
,new-access-form))))))
`(apply (lambda ,',(mapcar 'car bindings)
,,@body)
'(,,@(mapcar 'cadr bindings)))
,new-access-form)))))))
,@(if doc (list doc))
',access-fn))))))))

Expand Down