X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/553aa0e34084d66d125122ea4fd82206082b5861..07dafdb05d2142564c1fd14265cf174cb3ab92f3:/gffi/virtual-slots.lisp

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index 2c2263a..f539855 100644
--- 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.5 2006/09/13 10:52:16 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.8 2007/06/01 06:46:06 espen Exp $
 
 (in-package "GFFI")
 
@@ -117,12 +117,11 @@
        
        ;; An explicit boundp function has been supplied
        ((slot-boundp slotd 'boundp) 
-	(let ((unbound-value (slot-value slotd 'boundp)))
+	(let ((boundp (slot-value slotd 'boundp)))
 	  #'(lambda (object)
-	      (let ((value (funcall reader-function object)))
-		(if (eq value unbound-value)
-		    (slot-unbound (class-of object) object (slot-definition-name slotd))
-		  value)))))
+	      (if (not (funcall boundp object))
+		  (slot-unbound (class-of object) object (slot-definition-name slotd))
+		(funcall reader-function object)))))
        
        ;; A type unbound value exists
        ((let ((unbound-method (find-applicable-type-method 'unbound-value 
@@ -207,6 +206,8 @@
     #+sbcl
     (etypecase setter
       (symbol #'(lambda (object value) (funcall setter object value)))
+      (list #'(lambda (object value)
+		(funcall setter value object)))
       (function setter))))
 
 (define-condition slot-can-not-be-unbound (cell-error)
@@ -318,18 +319,22 @@
 ;; created.
 #?(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))
 (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))
 (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))
 (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)))