X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=8a38f2587594b61bef6056a725f4acc4a0a33498;hb=9dda770053b77a4f890432d41ba0b1f49adf12cc;hp=f68dc810494bcc8137f90ad047191fdb97629ad2;hpb=a02939cd8bffe86dd2fe96cf4eb2bc9a2351a3f0;p=hyperobject.git diff --git a/rules.lisp b/rules.lisp index f68dc81..8a38f25 100644 --- a/rules.lisp +++ b/rules.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: rules.lisp,v 1.4 2003/04/22 15:20:57 kevin Exp $ +;;;; $Id: rules.lisp,v 1.7 2003/04/22 15:26:16 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -70,24 +70,25 @@ (slot standard-effective-slot-definition)) (call-next-method)) -#+ignore (defmethod (setf slot-value-using-class) :around (new-value (cl hyperobject-class) obj (slot standard-effective-slot-definition)) - #+ignore +; #+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) + #+ignore (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)))) + (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