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

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index 66f547f..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)
@@ -282,28 +283,31 @@
      (append '(:special t) (call-next-method)))
     (t (call-next-method))))
 
-(defmacro vsc-slot-x-using-class (x x-slot-name computer)
+(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 ,generic-name
-         ((class virtual-slots-class) (object virtual-slots-object)
+    `(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 (slot-boundp slotd ',x-slot-name)
+       (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) object))))
+       (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 value getter compute-slot-reader-function)
 (vsc-slot-x-using-class boundp boundp-function compute-slot-boundp-function)
 (vsc-slot-x-using-class makunbound makunbound-function
                         compute-slot-makunbound-function)
 
-(defmethod (setf slot-value-using-class) (value (class virtual-slots-class)
-                                          (object virtual-slots-object)
-                                          (slotd effective-virtual-slot-definition))
-  (unless (slot-boundp slotd 'setter)
-    (setf (slot-value slotd 'setter) (compute-slot-writer-function slotd)))
-  (funcall (slot-value slotd 'setter) value object))
-
 ;; 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
 ;; of finalize-instance being called recursivly we have to delay the