X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=bf6105cf3361a4c203a60c83704c144eb80ede56;hb=ea3b9fa709caaff0f7b63acbd60be499d9ea2f06;hp=cdffc345a271a684edc82944d95d989937cd9bc5;hpb=495bae1f27400071ca9463bcf012eb2ff4a54577;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index cdffc34..bf6105c 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.15 2003/04/22 15:41:33 kevin Exp $
+;;;; $Id: rules.lisp,v 1.31 2003/04/24 20:30:11 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,37 +65,43 @@
 	(funcall (func rule) obj)))))
 
 
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (slot standard-effective-slot-definition))
-    (call-next-method))
+#+ignore
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
+  ;; this does not work on gerd-pcl in cmu 18e+
+  (esd-value-constraint slot)
+  (call-next-method))
+
+;; required for cmucl18e+ work-around
+(defun do-svuc (new-value cl obj slot)
+
+  #+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)
+       (values (slot-value obj (slot-definition-name slot)) nil)
+      (t
+       (values new-value t))))))
+
 
-(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)
+(defmethod (setf slot-value-using-class) :around 
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
+  (multiple-value-bind (value changed-p) (do-svuc new-value cl obj slot)
+    (when changed-p
+      (setq value (call-next-method))
+      (when (direct-rules cl)
+	(fire-class-rules cl obj slot)))
+    value))
+    
 
-    (esd-value-constraint slot)
-    #+ignore
-    (slot-value slot 'value-constraint)
-    (call-next-method)
-    #+ignore
-    (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
-	 (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
-					   (slot standard-effective-slot-definition))
+(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))