X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=1c8f505dfdaa65787ea96cdfbced93a77b90b0ab;hb=ed38cba0d2ed61535a9911969bfd000d5ae1ffb9;hp=722a4210078ce35b3165c41ef803284c75b4ef64;hpb=cd6808ca495d1e87294b17610dc34d3dc5dc4c15;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 722a421..1c8f505 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,10 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.25 2003/04/22 18:47:26 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id: rules.lisp,v 1.39 2003/05/14 05:29:48 kevin Exp $
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -64,22 +63,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+
-(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)))
-    (call-next-method)
-    #+ignore
+  (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"
@@ -90,10 +83,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))