X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=rules.lisp;h=f87893bc2c660833777b50c011fe2b8914f99bfb;hb=0c75b128bff84b53d46402c17e76c8cc6ba16c4b;hp=539d8cc1ba3d40d0792c0f135e17a1fbb9b789fe;hpb=7a47f293050da35c6e7600621e4f555199c36ee4;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 539d8cc..f87893b 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.3 2003/04/22 15:18:56 kevin Exp $
+;;;; $Id: rules.lisp,v 1.6 2003/04/22 15:24:39 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,7 +65,6 @@
 	(funcall (func rule) obj)))))
 
 
-#+ignore
 (defmethod (setf slot-value-using-class) 
     :around (new-value (cl hyperobject-class) obj
 		       (slot standard-effective-slot-definition))
@@ -74,21 +73,21 @@
 (defmethod (setf slot-value-using-class) 
     :around (new-value (cl hyperobject-class) obj
 		       (slot standard-effective-slot-definition))
-    #+ignore
+;    #+ignore
     (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)))
       (cond
+	#+ignore
 	((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)))
 	(t
-	 (call-next-method)
-	 #+ignore
-	 (when (direct-rules cl)
-	   (fire-class-rules cl obj slot))
-	 new-value))))
+	 (prog1
+	     (call-next-method)
+	   (when (direct-rules cl)
+	     (fire-class-rules cl obj slot)))))))
 
 #+ignore
 (defmethod slot-value-using-class :around ((cl hyperobject-class) obj