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

diff --git a/rules.lisp b/rules.lisp
index 11d7dbf..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.1 2002/12/26 23:18:16 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)
@@ -65,33 +64,22 @@
 	(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))
 
-(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)))
-      (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))))
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
 
-#+ignore
-(defmethod slot-value-using-class :around ((cl hyperobject-class) obj
-					   (slot standard-effective-slot-definition))
-  (let ((value (call-next-method)))
-    (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
-    value))
+  #+ignore
+  (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
+  
+  (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"
+	     (slot-definition-name slot) obj)
+       (slot-value obj (slot-definition-name slot)))
+      (t
+       (prog1
+	   (call-next-method)
+	 (when (direct-rules cl)
+	   (fire-class-rules cl obj slot)))))))