Delayed initialization of internal slot functions for all implementations

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index a004608c4ec7eb9960ec026fc103b5ba9bbbe69a..b2572737be203b08c26a32542aa8ddfb2523c3d6 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.
 
 ;; 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.10 2007/06/20 13:34:53 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.11 2007/11/08 13:49:26 espen Exp $

 
 (in-package "GFFI")
 
 
 (in-package "GFFI")
 


@@ -239,7 +239,8 @@ (defmethod compute-slot-makunbound-function ((slotd effective-virtual-slot-defin
 
 #-clisp
 (defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))
 
 #-clisp
 (defmethod initialize-internal-slot-functions ((slotd effective-virtual-slot-definition))

-  #?-(sbcl>= 0 9 15) ; Delayed to avoid recursive call of finalize-inheritanze
+;;   #?-(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)
   (setf 
    (slot-value slotd 'reader-function) (compute-slot-reader-function slotd)
    (slot-value slotd 'boundp-function) (compute-slot-boundp-function slotd)


@@ -317,22 +318,23 @@ (defmethod slot-makunbound-using-class
 ;; of finalize-instance being called recursivly we have to delay the
 ;; initialization of slot functions until after an instance has been
 ;; created.
 ;; 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)))
 
 (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)))
 
 (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)))
 
 (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)))
 (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)))