From 7db7e0545f936aad955b9f7ab6c4e141799e059d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Sat, 28 Jan 2023 22:15:54 +0100 Subject: [PATCH] clos: defcombin: fix regressions --- src/clos/defcombin.lsp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/clos/defcombin.lsp b/src/clos/defcombin.lsp index fee4c7146..753018d11 100644 --- a/src/clos/defcombin.lsp +++ b/src/clos/defcombin.lsp @@ -150,7 +150,7 @@ (push '&allow-other-keys lambda-list)) (when mc-aux-vars (push '&aux lambda-list) - (loop for a on mc-aux-vars by #'cddr + (loop for a on (rest mc-aux-vars) by #'cddr do (push `(,(first a) ,(second a)) lambda-list))) `(apply #'(lambda ,(nreverse lambda-list) (declare (ignore ,@ignored-vars)) @@ -261,7 +261,8 @@ (error "~S is not a valid DEFINE-METHOD-COMBINATION form." form))) (destructuring-bind (name lambda-list method-groups &rest body &aux (generic-function '.generic-function.) - (arguments nil)) + (arguments nil) + decls documentation) form (let ((x (first body))) (when (and (consp x) (eql (first x) :ARGUMENTS))