r4625: Auto commit for Debian build

[hyperobject.git] / rules.lisp

diff --git a/rules.lisp b/rules.lisp
index ad2901e0a8c6dccad68f2ef4ccf2c398353affff..bf6105cf3361a4c203a60c83704c144eb80ede56 100644 (file)
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.28 2003/04/23 20:22:23 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,33 +65,39 @@
        (funcall (func rule) obj)))))
 
 
+#+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)
+  (esd-value-constraint slot)
   (call-next-method))
 
-#+ignore
-(defmethod (setf slot-value-using-class) :around 
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
+;; 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)))
-    (call-next-method)
     (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)))
+       (values (slot-value obj (slot-definition-name slot)) nil)
       (t
-       (prog1
-          (call-next-method)
-        (when (direct-rules cl)
-          (fire-class-rules cl obj slot)))))))
+       (values new-value t))))))
 
 
+(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))
+    
+
 
 #+ignore
 (defmethod (setf slot-value-using-class) :around