From 1d2032d45fc8c2603685f5f8f606c066b9418e6e Mon Sep 17 00:00:00 2001
From: Rupert Swarbrick <rswarbrick@gmail.com>
Date: Tue, 3 Jan 2012 13:35:43 +0000
Subject: [PATCH] Hopefully allow (require :glib) again.

This should work around most of the hacky crap that was depending on
SBCL internals (about a year out of date). I had to keep
COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS, but hopefully I'll
understand/rewrite enough of GFFI to be able to drop it eventually!
---
 gffi/defpackage.lisp    |  8 +++++++
 gffi/virtual-slots.lisp | 55 +++++++++++++++++++++----------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/gffi/defpackage.lisp b/gffi/defpackage.lisp
index 4e4dcf8..2e9148a 100644
--- a/gffi/defpackage.lisp
+++ b/gffi/defpackage.lisp
@@ -38,6 +38,14 @@
 	   "ALIEN-SAP")
   #+cmu(:import-from "C-CALL" "VOID" "C-STRING")
   #+sbcl(:import-from "SB-ALIEN" "VOID" "C-STRING")
+
+  ;; We override COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS for virtual slots
+  ;; and proxy classes.
+  #+(or cmu sbcl)
+  (:import-from
+   #+cmu"PCL" #+sbcl"SB-PCL"
+   "COMPUTE-EFFECTIVE-SLOT-DEFINITION-INITARGS")
+
   ;; Symbols from memory.lisp
   (:export "MAKE-POINTER" "POINTER-ADDRESS" "NULL-POINTER-P" "POINTER=" 
 	   "POINTER+" "REF-POINTER" 
diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index 3025e93..66f547f 100644
--- a/gffi/virtual-slots.lisp
+++ b/gffi/virtual-slots.lisp
@@ -239,15 +239,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 +282,27 @@
      (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
-- 
2.11.0