X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=f8697e0979f863bc9b39c4c3b26ceb7c97612af8;hb=39d00302eebe628c8bdc89d6a292a0d9bfe3f7bc;hp=11d7dbfa5ab6266f7b3bf03d3e65572b9fcb219a;hpb=2ec170fb14c93a96313863aa47892bf1187503dc;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 11d7dbf..f8697e0 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.1 2002/12/26 23:18:16 kevin Exp $
+;;;; $Id: rules.lisp,v 1.17 2003/04/22 15:47:46 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))
@@ -76,18 +75,23 @@
 		       (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)))
+
+    (esd-value-constraint slot)
+    (call-next-method)
+#|    
+    (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