X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fgeneric-functions.lisp;h=0b633a689fac33c8c1c03bf3c4533c86d416b308;hb=961c6bf2eda5d492d5dbb7e275fe4e0931f7adf8;hp=73462f16c6fe6206bba852a20c4524585010fa4a;hpb=942e45e3bb73fd55786e4a0ab4590324063c0c89;p=sbcl.git diff --git a/src/pcl/generic-functions.lisp b/src/pcl/generic-functions.lisp index 73462f1..0b633a6 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)) @@ -106,8 +104,6 @@ (defgeneric method-combination-type-name (standard-method-combination)) -(defgeneric method-fast-function (standard-method)) - (defgeneric method-generic-function (standard-method)) (defgeneric object-plist (plist-mixin)) @@ -117,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 @@ -140,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)) @@ -194,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) @@ -219,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)) @@ -233,8 +221,6 @@ ;;;; 1 argument -(defgeneric accessor-method-class (method)) - (defgeneric accessor-method-slot-name (m)) (defgeneric class-default-initargs (class)) @@ -265,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)) @@ -281,8 +269,6 @@ (defgeneric method-lambda-list (m)) -(defgeneric method-pretty-arglist (method)) - (defgeneric method-qualifiers (m)) (defgeneric method-specializers (m)) @@ -334,20 +320,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)) @@ -356,6 +328,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)) @@ -379,7 +353,7 @@ ;;; This controls DESCRIBE-OBJECT (SLOT-OBJECT STREAM) behavior. (defgeneric slots-to-inspect (class object)) -(defgeneric update-gf-dfun (class gf)) +(defgeneric unparse-specializer-using-class (generic-function specializer)) (defgeneric validate-superclass (class superclass)) @@ -391,12 +365,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): @@ -415,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)) @@ -435,20 +401,27 @@ ;;;; 4 arguments -(defgeneric make-method-lambda (proto-generic-function - proto-method - lambda-expression - environment)) +(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)) +;;; 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)) ;;;; optional arguments @@ -470,6 +443,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 @@ -481,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)) @@ -495,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))