From 2f1ec17910acd51b2040ef767c946f4ca727bee4 Mon Sep 17 00:00:00 2001 Message-Id: <2f1ec17910acd51b2040ef767c946f4ca727bee4.1716467444.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 1 Jun 2007 06:46:06 +0000 Subject: [PATCH 1/1] Bug fix Organization: Straylight/Edgeware From: espen --- gffi/virtual-slots.lisp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gffi/virtual-slots.lisp b/gffi/virtual-slots.lisp index fb4a9cb..ff339eb 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.7 2007-05-10 20:23:56 espen Exp $ +;; $Id: virtual-slots.lisp,v 1.8 2007-06-01 06:46:06 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 -- [mdw]