Hopefully allow (require :glib) again.

[clg] / gffi / virtual-slots.lisp

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index 162b4f4101f2edd8acaae28d519a7036551c828f..66f547f7ff4614a66770924ea2da9bb99861efa3 100644 (file)
--- a/gffi/virtual-slots.lisp
+++ b/gffi/virtual-slots.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: virtual-slots.lisp,v 1.9 2007-06-15 12:23:39 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.11 2007-11-08 13:49:26 espen Exp $
 
 (in-package "GFFI")
 
@@ -205,10 +205,8 @@ (defmethod compute-slot-writer-function ((slotd effective-virtual-slot-definitio
     #-sbcl setter
     #+sbcl
     (etypecase setter
-      (symbol #'(lambda (object value) (funcall setter object value)))
-      (list #'(lambda (object value)
-               ;; Setter is a (setf ...) form and thus takes the
-               ;; value as the first argument
+      (symbol #'(lambda (value object) (funcall setter value object)))
+      (list #'(lambda (value object)
                (funcall setter value object)))
       (function setter))))
 
@@ -241,14 +239,8 @@ (defmethod compute-slot-makunbound-function ((slotd effective-virtual-slot-defin
 
 #-clisp
 (defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))
-  #?-(sbcl>= 0 9 15) ; Delayed to avoid recursive call of finalize-inheritanze
-  (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
@@ -290,51 +282,50 @@ (defmethod compute-effective-slot-definition-initargs ((class virtual-slots-clas
      (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)
+  (let ((generic-name (intern (concatenate 'string
+                                           "SLOT-" (string x) "-USING-CLASS"))))
+    `(defmethod ,generic-name
+         ((class virtual-slots-class) (object virtual-slots-object)
+          (slotd effective-virtual-slot-definition))
+       (unless (slot-boundp slotd ',x-slot-name)
+         (setf (slot-value slotd ',x-slot-name) (,computer slotd)))
+       (funcall (slot-value slotd ',x-slot-name) object))))
+
+(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
 ;; initialization of slot functions until after an instance has been
 ;; created.
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; 2007-11-08: done this for all implementations
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
 (defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'reader-function)))
   (declare (ignore class))
   (setf (slot-value slotd name) (compute-slot-reader-function slotd)))
 
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
 (defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'boundp-function)))
   (declare (ignore class))
   (setf (slot-value slotd name) (compute-slot-boundp-function slotd)))
 
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
 (defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'writer-function)))
   (declare (ignore class))
   (setf (slot-value slotd name) (compute-slot-writer-function slotd)))
 
-#?(or (sbcl>= 0 9 15) (featurep :clisp))
+;; #?(or (sbcl>= 0 9 15) (featurep :clisp))
 (defmethod slot-unbound (class (slotd effective-virtual-slot-definition) (name (eql 'makunbound-function)))
   (declare (ignore class))
   (setf (slot-value slotd name) (compute-slot-makunbound-function slotd)))