;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: rules.lisp,v 1.31 2003/04/24 20:30:11 kevin Exp $
+;;;; $Id: rules.lisp,v 1.35 2003/04/25 05:29:02 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
#+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)
+(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 (esd-value-constraint slot)))
+ (let ((func
+ (esd-value-constraint slot)
+ ;; The following causes an error with sbcl
+ #+ignore
+ (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"
(slot-definition-name slot) obj)
- (values (slot-value obj (slot-definition-name slot)) nil)
+ (slot-value obj (slot-definition-name slot)))
(t
- (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))
-
+ (prog1
+ (call-next-method)
+ (when (direct-rules cl)
+ (fire-class-rules cl obj slot)))))))
#+ignore