X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=a7bd048579fb5e8053d9d8083b1103da03f7d052;hb=4675e305339bd8b9f4cc15eb5f2da6036907a301;hp=cd778bf3c8793ed28a57535ce258691b0ba00e79;hpb=39649a3847bb90946412f702afa6143100c84412;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index cd778bf..a7bd048 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.24 2003/04/22 18:45:32 kevin Exp $
+;;;; $Id: rules.lisp,v 1.38 2003/05/04 03:30:28 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -64,21 +64,16 @@
 	(cmsg-c :debug "firing rule: ~W" (source-code rule))
 	(funcall (func rule) obj)))))
 
-#+ignore
-(defmethod (setf slot-value-using-class) :around
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (call-next-method))
 
-;; this does not work on gerd-pcl in cmu 18e+
-#+ignore
-(defmethod (setf slot-value-using-class) :around 
+
+(defmethod (setf slot-value-using-class) :around
     (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
 
   #+ignore
   (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
   
-  
-  (let ((func (slot-value slot 'value-constraint)))
+  (let ((func (when (slot-boundp slot 'value-constraint)
+		(esd-value-constraint slot))))
     (cond
       ((and func (not (funcall func new-value)))
        (warn "Rejected change to value of slot ~a of object ~a"
@@ -89,10 +84,3 @@
 	   (call-next-method)
 	 (when (direct-rules cl)
 	   (fire-class-rules cl obj slot)))))))
-
-#+ignore
-(defmethod (setf slot-value-using-class) :around
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (let ((value (call-next-method)))
-    (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
-    value))