From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 24 Apr 2003 20:30:11 +0000 (+0000)
Subject: r4625: Auto commit for Debian build
X-Git-Tag: debian-2.11.0-2~111
X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=commitdiff_plain;h=ea3b9fa709caaff0f7b63acbd60be499d9ea2f06

r4625: Auto commit for Debian build
---

diff --git a/rules.lisp b/rules.lisp
index a597c36..bf6105c 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.30 2003/04/24 20:12:24 kevin Exp $
+;;;; $Id: rules.lisp,v 1.31 2003/04/24 20:30:11 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -79,22 +79,24 @@
   (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
   
   (let ((func (esd-value-constraint slot)))
-    (call-next-method)
     (cond
       ((and func (not (funcall func new-value)))
        (warn "Rejected change to value of slot ~a of object ~a"
 	     (slot-definition-name slot) obj)
-       (slot-value obj (slot-definition-name slot)))
+       (values (slot-value obj (slot-definition-name slot)) nil)
       (t
-       (prog1
-	   (call-next-method)
-	 (when (direct-rules cl)
-	   (fire-class-rules cl obj slot)))))))
+       (values new-value t))))))
 
 
 (defmethod (setf slot-value-using-class) :around 
     (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (do-svuc new-value cl obj slot))
+  (multiple-value-bind (value changed-p) (do-svuc new-value cl obj slot)
+    (when changed-p
+      (setq value (call-next-method))
+      (when (direct-rules cl)
+	(fire-class-rules cl obj slot)))
+    value))
+    
 
 
 #+ignore