X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=1e220c43b329ba34ef252a9f7afa5513b11cc615;hb=da57e4f1ef6bef626996ce87fca1abf225274128;hp=f68dc810494bcc8137f90ad047191fdb97629ad2;hpb=a02939cd8bffe86dd2fe96cf4eb2bc9a2351a3f0;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index f68dc81..1e220c4 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.36 2003/04/27 18:40:55 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,33 +65,35 @@
 	(funcall (func rule) obj)))))
 
 
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (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
-    (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)))
-      (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)
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
+  (call-next-method))
+
+;; 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 (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)
+       (slot-value obj (slot-definition-name slot)))
+      (t
+       (prog1
+	   (call-next-method)
 	 (when (direct-rules cl)
-	   (fire-class-rules cl obj slot))
-	 new-value))))
+	   (fire-class-rules cl obj slot)))))))
+
 
 #+ignore
-(defmethod slot-value-using-class :around ((cl hyperobject-class) obj
-					   (slot standard-effective-slot-definition))
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
   (let ((value (call-next-method)))
     (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
     value))