projects
/
hyperobject.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4625: Auto commit for Debian build
[hyperobject.git]
/
rules.lisp
diff --git
a/rules.lisp
b/rules.lisp
index a597c36d41bb68a155e97be0af897e92804158c4..bf6105cf3361a4c203a60c83704c144eb80ede56 100644
(file)
--- a/
rules.lisp
+++ b/
rules.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: rules.lisp,v 1.3
0 2003/04/24 20:12:24
kevin Exp $
+;;;; $Id: rules.lisp,v 1.3
1 2003/04/24 20:30:11
kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
@@
-79,22
+79,24
@@
(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)))
(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)
(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
(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))
(defmethod (setf slot-value-using-class) :around
(new-value (cl hyperobject-class) obj (slot hyperobject-esd))
- (do-svuc new-value cl obj slot))
+ (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
#+ignore