X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=3783d7fcb17989f5b0f32f43f12f83bd484e663c;hb=2f0f17decf97d3140b00697828c7135152430319;hp=1b24cdf8e2c3e7458789eb04e8ee65966c9c93b2;hpb=afe31b09d8469efb141306db5dfb9b75b37b7953;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 1b24cdf..3783d7f 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.2 2003/04/22 14:07:18 kevin Exp $
+;;;; $Id: rules.lisp,v 1.21 2003/04/22 15:56:20 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,30 +65,32 @@
 	(funcall (func rule) obj)))))
 
 
-#+ignore
 (defmethod (setf slot-value-using-class) 
     :around (new-value (cl hyperobject-class) obj
 		       (slot standard-effective-slot-definition))
     (call-next-method))
 
-#+ignore
+;; this does not work on gerd-pcl in cmu 18e+
+#-cmu  
 (defmethod (setf slot-value-using-class) 
     :around (new-value (cl hyperobject-class) obj
 		       (slot standard-effective-slot-definition))
     #+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)))
+    (let ((func (slot-value slot 'value-constraint)))
       (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)))
 	(t
-	 (call-next-method)
-	 (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