0.8.14.1:

	Fix for defgeneric expansion as reported on sbcl-devel Aug 31, 2004

diff --git a/NEWS b/NEWS
index 6f89571..3c77c9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+changes in sbcl-0.8.15 relative to sbcl-0.8.14:
+  * bug fix: incorrect expansion of defgeneric that caused
+    a style warning. (thanks for Zach Beane)
+
 changes in sbcl-0.8.14 relative to sbcl-0.8.13:
   * incompatible change: the internal functions
     SB-KERNEL:32BIT-LOGICAL-FOO, intended for providing efficient

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 3e6d8b3..f141b1d 100644 (file)
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -239,7 +239,7 @@ bootstrapping.
           (compile-or-load-defgeneric ',fun-name))
          (load-defgeneric ',fun-name ',lambda-list ,@initargs)
         ,@(mapcar #'expand-method-definition methods)
-        #',fun-name))))
+        (fdefinition ',fun-name)))))
 
 (defun compile-or-load-defgeneric (fun-name)
   (proclaim-as-fun-name fun-name)

diff --git a/tests/clos.impure.lisp b/tests/clos.impure.lisp
index 28ab7ae..629041f 100644 (file)
--- a/tests/clos.impure.lisp
+++ b/tests/clos.impure.lisp
@@ -821,5 +821,14 @@
   x)
 (assert (= (fum 3) 3/2))
 
+;;; Bug reported by Zach Beane; incorrect return of (function
+;;; ',fun-name) in defgeneric
+(assert
+ (typep (funcall (compile nil
+                          '(lambda () (flet ((nonsense () nil))
+                                        (defgeneric nonsense ())))))
+        'generic-function))
+
+
 ;;;; success
 (sb-ext:quit :unix-status 104)

diff --git a/version.lisp-expr b/version.lisp-expr
index a0fb24d..c0b95e7 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".)
-"0.8.14"
+"0.8.14.1"