X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fpcl%2Fgeneric-functions.lisp;h=4c44940618a3ffd3b4fecc7f2d1a66ba56c9c883;hb=3cc4b17d770f3fe95e5e94f6ac39820784968c4d;hp=0b45a7a3f23fe20e02cd7ed147667fae87144a8c;hpb=63cef087068afc157283c0a05ae1f16b962303aa;p=sbcl.git

diff --git a/src/pcl/generic-functions.lisp b/src/pcl/generic-functions.lisp
index 0b45a7a..4c44940 100644
--- a/src/pcl/generic-functions.lisp
+++ b/src/pcl/generic-functions.lisp
@@ -14,6 +14,8 @@
 
 (defgeneric classp (object))
 
+(defgeneric condition-class-p (object))
+
 (defgeneric eql-specializer-p (object))
 
 (defgeneric exact-class-specializer-p (object))
@@ -84,6 +86,8 @@
 
 (defgeneric eql-specializer-object (eql-specializer))
 
+(defgeneric generic-function-declarations (standard-generic-function))
+
 (defgeneric generic-function-method-class (standard-generic-function))
 
 (defgeneric generic-function-method-combination (standard-generic-function))
@@ -176,6 +180,9 @@
 (defgeneric (setf generic-function-method-combination)
   (new-value standard-generic-function))
 
+(defgeneric (setf generic-function-declarations) (new-value
+						  standard-generic-function))
+
 (defgeneric (setf generic-function-methods) (new-value
 					     standard-generic-function))
 
@@ -264,6 +271,8 @@
 
 (defgeneric function-keywords (method))
 
+(defgeneric generic-function-argument-precedence-order (gf))
+
 (defgeneric generic-function-lambda-list (gf))
 
 (defgeneric generic-function-pretty-arglist (generic-function))
@@ -312,8 +321,6 @@
 
 (defgeneric add-method (generic-function method))
 
-(defgeneric change-class (instance new-class-name))
-
 (defgeneric class-slot-value (class slot-name))
 
 (defgeneric compatible-meta-class-change-p (class proto-new-class))
@@ -323,17 +330,13 @@
 (defgeneric compute-applicable-methods-using-classes
   (generic-function classes))
 
-(defgeneric compute-effective-slot-definition (class dslotds))
-
 (defgeneric compute-effective-slot-definition-initargs (class direct-slotds))
 
-(defgeneric default-initargs (class supplied-initargs))
-
 (defgeneric describe-object (object stream))
 
-(defgeneric direct-slot-definition-class (class initargs))
+(defgeneric direct-slot-definition-class (class &rest initargs))
 
-(defgeneric effective-slot-definition-class (class initargs))
+(defgeneric effective-slot-definition-class (class &rest initargs))
 
 (defgeneric legal-documentation-p (object x))
 
@@ -400,12 +403,24 @@
 
 (defgeneric (setf class-slot-value) (nv class slot-name))
 
+;;; CMUCL comment (from Gerd Moellmann/Pierre Mai, 2002-10-19):
+;;;
+;;; According to AMOP, COMPUTE-EFFECTIVE-METHOD should return two
+;;; values.  Alas, the second value is only vaguely described in AMOP,
+;;; and, when asked on 2002-10-18, Gregor Kiczales said he couldn't
+;;; remember what the second value was supposed to be.  So, PCL's
+;;; COMPUTE-EFFECTIVE-METHOD returns one value as do Allegro and
+;;; Lispworks.
 (defgeneric compute-effective-method (generic-function
 				      combin
 				      applicable-methods))
 
+(defgeneric compute-effective-slot-definition (class name dslotds))
+
 (defgeneric compute-slot-accessor-info (slotd type gf))
 
+(defgeneric default-initargs (class initargs defaults))
+
 (defgeneric find-method-combination (generic-function type options))
 
 (defgeneric (setf slot-accessor-function) (function slotd type))
@@ -442,16 +457,12 @@
 (defgeneric get-method (generic-function
 			qualifiers
 			specializers
-			&optional (errorp t)))
+			&optional errorp))
 
 (defgeneric find-method (generic-function
 			 qualifiers
 			 specializers
-			 &optional (errorp t)))
-
-(defgeneric remove-named-method (generic-function-name
-				 argument-specifiers
-				 &optional extra))
+			 &optional errorp))
 
 (defgeneric slot-missing (class
 			  instance
@@ -463,8 +474,8 @@
 
 (defgeneric allocate-instance (class &rest initargs))
 
-(defgeneric ensure-class-using-class (name
-				      class
+(defgeneric ensure-class-using-class (class
+				      name
 				      &rest args
 				      &key &allow-other-keys))
 
@@ -474,10 +485,16 @@
 
 (defgeneric initialize-instance (gf &key &allow-other-keys))
 
-(defgeneric make-instance (class &rest initargs))
+(defgeneric make-instance (class &rest initargs &key &allow-other-keys))
+
+(defgeneric change-class (instance new-class-name &rest initargs &key &allow-other-keys))
 
 (defgeneric no-applicable-method (generic-function &rest args))
 
+(defgeneric no-next-method (generic-function method &rest args))
+
+(defgeneric no-primary-method (generic-function &rest args))
+
 (defgeneric reader-method-class (class direct-slot &rest initargs))
 
 (defgeneric reinitialize-instance (gf &rest args &key &allow-other-keys))