X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fgeneric-functions.lisp;h=0b633a689fac33c8c1c03bf3c4533c86d416b308;hb=0f3a5f2e8886d18d0b4f6485c38a42be629422ae;hp=547557aad09108ee5445554c151100d2967b2a70;hpb=990728854b8ba017888811d1b0453b15dfa8a581;p=sbcl.git

diff --git a/src/pcl/generic-functions.lisp b/src/pcl/generic-functions.lisp
index 547557a..0b633a6 100644
--- a/src/pcl/generic-functions.lisp
+++ b/src/pcl/generic-functions.lisp
@@ -113,8 +113,6 @@
 
 (defgeneric short-combination-operator (short-method-combination))
 
-(defgeneric slot-definition-boundp-function (effective-slot-definition))
-
 (defgeneric slot-definition-class (slot-definition))
 
 (defgeneric slot-definition-defstruct-accessor-symbol
@@ -136,14 +134,12 @@
 
 (defgeneric slot-definition-name (slot-definition))
 
-(defgeneric slot-definition-reader-function (effective-slot-definition))
+(defgeneric slot-definition-info (effective-slot-definition))
 
 (defgeneric slot-definition-readers (slot-definition))
 
 (defgeneric slot-definition-type (slot-definition))
 
-(defgeneric slot-definition-writer-function (effective-slot-definition))
-
 (defgeneric slot-definition-writers (slot-definition))
 
 (defgeneric specializer-object (class-eq-specializer))
@@ -190,9 +186,6 @@
 (defgeneric (setf slot-definition-allocation) (new-value
                                                standard-slot-definition))
 
-(defgeneric (setf slot-definition-boundp-function)
-  (new-value effective-slot-definition))
-
 (defgeneric (setf slot-definition-class) (new-value slot-definition))
 
 (defgeneric (setf slot-definition-defstruct-accessor-symbol)
@@ -215,8 +208,7 @@
 
 (defgeneric (setf slot-definition-name) (new-value slot-definition))
 
-(defgeneric (setf slot-definition-reader-function) (new-value
-                                                    effective-slot-definition))
+(defgeneric (setf slot-definition-info) (new-value effective-slot-definition))
 
 (defgeneric (setf slot-definition-readers) (new-value slot-definition))
 
@@ -259,6 +251,8 @@
 
 (defgeneric function-keywords (method))
 
+(defgeneric function-keyword-parameters (method))
+
 (defgeneric generic-function-argument-precedence-order (gf))
 
 (defgeneric generic-function-lambda-list (gf))
@@ -275,8 +269,6 @@
 
 (defgeneric method-lambda-list (m))
 
-(defgeneric method-pretty-arglist (method))
-
 (defgeneric method-qualifiers (m))
 
 (defgeneric method-specializers (m))
@@ -363,8 +355,6 @@
 
 (defgeneric unparse-specializer-using-class (generic-function specializer))
 
-(defgeneric update-gf-dfun (class gf))
-
 (defgeneric validate-superclass (class superclass))
 
 (defgeneric (setf documentation) (new-value slotd doc-type)
@@ -393,8 +383,6 @@
 
 (defgeneric compute-slot-accessor-info (slotd type gf))
 
-(defgeneric default-initargs (class initargs defaults))
-
 (defgeneric find-method-combination (generic-function type options))
 
 (defgeneric invalid-qualifiers (generic-function combin method))
@@ -413,12 +401,6 @@
 
 ;;;; 4 arguments
 
-(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))
 
@@ -429,6 +411,14 @@
 
 ;;;; 5 arguments
 
+;;; FIXME: This is currently unused -- where should we call it? Or should we just
+;;; delete it.
+(defgeneric add-boundp-method (class generic-function slot-name slot-documentation source-location))
+
+(defgeneric add-reader-method (class generic-function slot-name slot-documentation source-location))
+
+(defgeneric add-writer-method (class generic-function slot-name slot-documentation source-location))
+
 (defgeneric make-method-initargs-form
     (proto-generic-function proto-method lambda-expression lambda-list
      environment))
@@ -466,7 +456,7 @@
                                                  fun-name
                                                  &key &allow-other-keys))
 
-(defgeneric initialize-instance (gf &key &allow-other-keys))
+(defgeneric initialize-instance (instance &rest initargs &key &allow-other-keys))
 
 (defgeneric make-instance (class &rest initargs &key &allow-other-keys))
 
@@ -480,10 +470,9 @@
 
 (defgeneric reader-method-class (class direct-slot &rest initargs))
 
-(defgeneric reinitialize-instance (gf &rest args &key &allow-other-keys))
+(defgeneric reinitialize-instance (instance &rest initargs &key &allow-other-keys))
 
-(defgeneric shared-initialize (generic-function
-                               slot-names
+(defgeneric shared-initialize (instance slot-names &rest initargs
                                &key &allow-other-keys))
 
 (defgeneric update-dependent (metaobject dependent &rest initargs))