1.0.4.47: correct the mess of 1.0.4.46

 * Previous was an accidental commit. Sorry.

diff --git a/src/code/early-setf.lisp b/src/code/early-setf.lisp
index 99926ae..0f63965 100644 (file)
--- a/src/code/early-setf.lisp
+++ b/src/code/early-setf.lisp
@@ -405,6 +405,7 @@ GET-SETF-EXPANSION directly."
                   (assign-setf-macro
                    ',access-fn
                    (lambda (,access-form-var ,env-var)
+                     (declare (ignorable ,env-var))
                      (%defsetf ,access-form-var ,(length store-variables)
                                (lambda (,whole-var)
                                  ,@local-decs

diff --git a/tests/setf.impure.lisp b/tests/setf.impure.lisp
index 62c7987..0867029 100644 (file)
--- a/tests/setf.impure.lisp
+++ b/tests/setf.impure.lisp
@@ -65,20 +65,20 @@
       local
       global))
 
-(aver (eq :local (macrolet ((defsetf-env-trick ()))
-                   (setf (test-defsetf-env-1) 13))))
+(assert (eq :local (macrolet ((defsetf-env-trick ()))
+                     (setf (test-defsetf-env-1) 13))))
 
-(aver (eq :global (setf (test-defsetf-env-1) 13)))
+(assert (eq :global (setf (test-defsetf-env-1) 13)))
 
-(aver (eq :local (macrolet ((defsetf-env-trick ()))
-                   (setf (test-defsetf-env-2 :local :oops) 13))))
+(assert (eq :local (macrolet ((defsetf-env-trick ()))
+                     (setf (test-defsetf-env-2 :local :oops) 13))))
 
-(aver (eq :global (setf (test-defsetf-env-2 :oops :global) 13)))
+(assert (eq :global (setf (test-defsetf-env-2 :oops :global) 13)))
 
-(aver (eq :error
-          (handler-case
-              (eval '(defsetf test-defsetf-aux (&aux aux) (new) nil))
-            (error ()
-              :error))))
+(assert (eq :error
+            (handler-case
+                (eval '(defsetf test-defsetf-aux (&aux aux) (new) nil))
+              (error ()
+                :error))))
 
 ;;; success

diff --git a/version.lisp-expr b/version.lisp-expr
index 0649a25..98053bf 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.4.46"
+"1.0.4.47"