X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/0bbf3105ee7496ce6748411458f2d22eb40479a9..b9f34364da134a8e58be17c4937543afb1da5d09:/gffi/virtual-slots.lisp

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index 3025e93..796521b 100644
--- a/gffi/virtual-slots.lisp
+++ b/gffi/virtual-slots.lisp
@@ -47,6 +47,7 @@
    #+clisp(writer-function)
    #+clisp(boundp-function)
    makunbound-function
+   boundp-function
    #+clisp(type :initarg :type :reader slot-definition-type)))
 
 (defclass direct-special-slot-definition (standard-direct-slot-definition)
@@ -239,15 +240,8 @@
 
 #-clisp
 (defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))
-;;   #?-(sbcl>= 0 9 15) ; Delayed to avoid recursive call of finalize-inheritanze
-  #+nil ;; 2007-11-08: done this for all implementations
-  (setf 
-   (slot-value slotd 'reader-function) (compute-slot-reader-function slotd)
-   (slot-value slotd 'boundp-function) (compute-slot-boundp-function slotd)
-   (slot-value slotd 'writer-function) (compute-slot-writer-function slotd)
-   (slot-value slotd 'makunbound-function) (compute-slot-makunbound-function slotd))
-
-  #?-(sbcl>= 0 9 8)(initialize-internal-slot-gfs (slot-definition-name slotd)))
+  #?-(sbcl>= 0 9 8)
+  (initialize-internal-slot-gfs (slot-definition-name slotd)))
 
 
 #-clisp
@@ -289,29 +283,30 @@
      (append '(:special t) (call-next-method)))
     (t (call-next-method))))
 
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod slot-value-using-class
-    ((class virtual-slots-class) (object virtual-slots-object)
-     (slotd effective-virtual-slot-definition))
-    (funcall (slot-value slotd 'reader-function) object))
-
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod slot-boundp-using-class
-    ((class virtual-slots-class) (object virtual-slots-object)
-     (slotd effective-virtual-slot-definition))
-    (funcall (slot-value slotd 'boundp-function) object))
-
-#?(or (not (sbcl>= 0 9 14)) (featurep :clisp))
-(defmethod (setf slot-value-using-class) 
-    (value (class virtual-slots-class) (object virtual-slots-object)
-     (slotd effective-virtual-slot-definition))
-  (funcall (slot-value slotd 'writer-function) value object))
-
-(defmethod slot-makunbound-using-class
-    ((class virtual-slots-class) (object virtual-slots-object)
-     (slotd effective-virtual-slot-definition))
-  (funcall (slot-value slotd 'makunbound-function) object))
-
+(defmacro vsc-slot-x-using-class (x x-slot-name computer
+                                  &key allow-string-fun-p setf-p)
+  (let ((generic-name (intern (concatenate 'string
+                                           "SLOT-" (string x) "-USING-CLASS"))))
+    `(defmethod ,(if setf-p `(setf ,generic-name) generic-name)
+         (,@(when setf-p '(value))
+          (class virtual-slots-class) (object virtual-slots-object)
+          (slotd effective-virtual-slot-definition))
+       (unless (and (slot-boundp slotd ',x-slot-name)
+                    ,@(when allow-string-fun-p
+                         `((not (stringp (slot-value slotd ',x-slot-name))))))
+         (setf (slot-value slotd ',x-slot-name) (,computer slotd)))
+       (funcall (slot-value slotd ',x-slot-name)
+                ,@(when setf-p '(value))
+                object))))
+
+(vsc-slot-x-using-class value getter compute-slot-reader-function
+                        :allow-string-fun-p t)
+(vsc-slot-x-using-class value setter compute-slot-writer-function
+                        :allow-string-fun-p t :setf-p t)
+
+(vsc-slot-x-using-class boundp boundp-function compute-slot-boundp-function)
+(vsc-slot-x-using-class makunbound makunbound-function
+                        compute-slot-makunbound-function)
 
 ;; In CLISP and SBCL (0.9.15 or newler) a class may not have been
 ;; finalized when update-slots are called. So to avoid the possibility