r4657: Auto commit for Debian build

[hyperobject.git] / rules.lisp

diff --git a/rules.lisp b/rules.lisp
index 7ce24ed2b8a4efe547c5e7ea4e52211c3970d9c7..1e220c43b329ba34ef252a9f7afa5513b11cc615 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.26 2003/04/22 19:19:41 kevin Exp $
+;;;; $Id: rules.lisp,v 1.36 2003/04/27 18:40:55 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -64,21 +64,21 @@
        (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 
+;; required for cmucl18e+ work-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)
+  (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,6 +90,7 @@
         (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))