Bug fix in CREATE-SIGNAL-EMIT-FUNCTION

[clg] / gffi / virtual-slots.lisp

diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp
index fb4a9cb66a61935f68830541ae72ef719de506de..7d8899d1dd6008c297d0d1e37b2de048e7802538 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.7 2007-05-10 20:23:56 espen Exp $
+;; $Id: virtual-slots.lisp,v 1.10 2007-06-20 13:34:53 espen Exp $
 
 (in-package "GFFI")
 
@@ -117,12 +117,11 @@ (defmethod compute-slot-reader-function :around ((slotd effective-virtual-slot-d
        
        ;; 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 
@@ -206,8 +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)
+      (symbol #'(lambda (value object) (funcall setter value object)))
+      (list #'(lambda (value object)
                (funcall setter value object)))
       (function setter))))