From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Wed, 1 Jun 2005 12:08:50 +0000 (+0000)
Subject: 0.9.1.13:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=d29b504c51bc69b3ea2eff8cdeaae4f7c9614b72;p=sbcl.git

0.9.1.13:
	Fix for Haiblebug "ensure-generic-function doesn't support
	:declare"
	... simply allow both :declare and :declarations;
	... add some documentation and index entries.
---

diff --git a/doc/manual/beyond-ansi.texinfo b/doc/manual/beyond-ansi.texinfo
index 61a89b8..6e44f7d 100644
--- a/doc/manual/beyond-ansi.texinfo
+++ b/doc/manual/beyond-ansi.texinfo
@@ -45,21 +45,38 @@ are:
 @itemize
   
 @item
+@tindex metaobject
 the abstract @code{metaobject} class is not present in the class
 hierarchy;
   
 @item
+@tindex standard-object
+@tindex funcallable-standard-object
 the @code{standard-object} and @code{funcallable-standard-object}
 classes are disjoint;
   
 @item
+@findex compute-effective-method
+@findex sb-mop:compute-effective-method
 @code{compute-effective-method} only returns one value, not two;
   
 @item
+@findex compute-slots
+@findex sb-mop:compute-slots
+@tindex funcallable-standard-class 
 the system-supplied @code{:around} method for @code{compute-slots}
 specialized on @code{funcallable-standard-class} does not respect the
 requested order from a user-supplied primary method.
 
+@item
+@findex ensure-generic-function
+@findex generic-function-declarations
+@findex sb-mop:generic-function-declarations
+the arguments @code{:declare} and @code{:declarations} to
+@code{ensure-generic-function} are both accepted, with the leftmost
+argument defining the declarations to be stored and returned by
+@code{generic-function-declarations}.
+
 @end itemize
 
 @node  Support For Unix
diff --git a/src/pcl/defs.lisp b/src/pcl/defs.lisp
index 534a6c2..77d79c9 100644
--- a/src/pcl/defs.lisp
+++ b/src/pcl/defs.lisp
@@ -700,7 +700,11 @@
     :initarg :method-combination
     :accessor generic-function-method-combination)
    (declarations
+    ;; KLUDGE: AMOP specifies :DECLARATIONS, while ANSI specifies
+    ;; :DECLARE.  Allow either (but FIXME: maybe a note or a warning
+    ;; might be appropriate).
     :initarg :declarations
+    :initarg :declare
     :initform ()
     :accessor generic-function-declarations)
    (arg-info
diff --git a/version.lisp-expr b/version.lisp-expr
index a0705a3..0fde2a5 100644
--- 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.9.1.12"
+"0.9.1.13"