X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fgeneric-functions.lisp;h=571221970d867a9a0b51e39440a7854ca72f1faf;hb=7f2a87e987b70891684cafe8c71e057b9cdc6092;hp=34f398193e3f0e9ef92c693082feb54e3f6353c0;hpb=2d237dbc3edb1f6f5337ab19dd74a317e43234db;p=sbcl.git

diff --git a/src/pcl/generic-functions.lisp b/src/pcl/generic-functions.lisp
index 34f3981..5712219 100644
--- a/src/pcl/generic-functions.lisp
+++ b/src/pcl/generic-functions.lisp
@@ -26,8 +26,6 @@
 
 (defgeneric generic-function-p (object))
 
-(defgeneric legal-lambda-list-p (object x))
-
 (defgeneric method-combination-p (object))
 
 (defgeneric method-p (object))
@@ -76,8 +74,6 @@
 
 (defgeneric class-precedence-list (pcl-class))
 
-(defgeneric class-predicate-name (class))
-
 (defgeneric class-wrapper (pcl-class))
 
 (defgeneric definition-source (definition-source-mixin))
@@ -106,9 +102,7 @@
 
 (defgeneric method-combination-options (standard-method-combination))
 
-(defgeneric method-combination-type (standard-method-combination))
-
-(defgeneric method-fast-function (standard-method))
+(defgeneric method-combination-type-name (standard-method-combination))
 
 (defgeneric method-generic-function (standard-method))
 
@@ -235,8 +229,6 @@
 
 ;;;; 1 argument
 
-(defgeneric accessor-method-class (method))
-
 (defgeneric accessor-method-slot-name (m))
 
 (defgeneric class-default-initargs (class))
@@ -265,7 +257,7 @@
 
 (defgeneric finalize-inheritance (class))
 
-(defgeneric function-keywords (method))
+(defgeneric function-keyword-parameters (method))
 
 (defgeneric generic-function-argument-precedence-order (gf))
 
@@ -283,8 +275,6 @@
 
 (defgeneric method-lambda-list (m))
 
-(defgeneric method-pretty-arglist (method))
-
 (defgeneric method-qualifiers (m))
 
 (defgeneric method-specializers (m))
@@ -336,20 +326,6 @@
 
 (defgeneric effective-slot-definition-class (class &rest initargs))
 
-(defgeneric legal-documentation-p (object x))
-
-(defgeneric legal-method-function-p (object x))
-
-(defgeneric legal-qualifier-p (object x))
-
-(defgeneric legal-qualifiers-p (object x))
-
-(defgeneric legal-slot-name-p (object x))
-
-(defgeneric legal-specializer-p (object x))
-
-(defgeneric legal-specializers-p (object x))
-
 (defgeneric make-boundp-method-function (class slot-name))
 
 (defgeneric make-reader-method-function (class slot-name))
@@ -358,6 +334,8 @@
 
 (defgeneric map-dependents (metaobject function))
 
+(defgeneric parse-specializer-using-class (generic-function specializer-name))
+
 (defgeneric remove-boundp-method (class generic-function))
 
 (defgeneric remove-dependent (metaobject dependent))
@@ -381,6 +359,8 @@
 ;;; This controls DESCRIBE-OBJECT (SLOT-OBJECT STREAM) behavior.
 (defgeneric slots-to-inspect (class object))
 
+(defgeneric unparse-specializer-using-class (generic-function specializer))
+
 (defgeneric update-gf-dfun (class gf))
 
 (defgeneric validate-superclass (class superclass))
@@ -393,12 +373,6 @@
 
 ;;;; 3 arguments
 
-(defgeneric add-boundp-method (class generic-function slot-name))
-
-(defgeneric add-reader-method (class generic-function slot-name))
-
-(defgeneric add-writer-method (class generic-function slot-name))
-
 (defgeneric (setf class-slot-value) (nv class slot-name))
 
 ;;; CMUCL comment (from Gerd Moellmann/Pierre Mai, 2002-10-19):
@@ -437,20 +411,25 @@
 
 ;;;; 4 arguments
 
-(defgeneric make-method-lambda (proto-generic-function
-                                proto-method
-                                lambda-expression
-                                environment))
+(defgeneric add-boundp-method (class generic-function slot-name slot-documentation))
+
+(defgeneric add-reader-method (class generic-function slot-name slot-documentation))
+
+(defgeneric add-writer-method (class generic-function slot-name slot-documentation))
+
+(defgeneric make-method-lambda
+    (proto-generic-function proto-method lambda-expression environment))
+
+(defgeneric make-method-specializers-form
+    (proto-generic-function proto-method specializer-names environment))
 
 (defgeneric (setf slot-value-using-class) (new-value class object slotd))
 
 ;;;; 5 arguments
 
-(defgeneric make-method-initargs-form (proto-generic-function
-                                       proto-method
-                                       lambda-expression
-                                       lambda-list
-                                       environment))
+(defgeneric make-method-initargs-form
+    (proto-generic-function proto-method lambda-expression lambda-list
+     environment))
 
 ;;;; optional arguments
 
@@ -472,6 +451,8 @@
 
 ;;;; &KEY arguments
 
+;;; FIXME: make the declared &KEY arguments here agree with those that
+;;; AMOP specifies.
 (defgeneric allocate-instance (class &rest initargs))
 
 (defgeneric ensure-class-using-class (class