X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=13300a5beb008ea6805ac153e3247dcc977e26a7;hb=51d6df70857648f762bf43486a5340a548d961c7;hp=e6c50f917d4a8c3db8d43b93f2a29d1acd4f337a;hpb=ce7f6dd227c1bd75565dcb429d2229860689d406;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index e6c50f9..13300a5 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,10 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.22 2003/04/22 15:58:07 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id: rules.lisp,v 1.42 2003/05/15 20:34:03 kevin Exp $
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -65,36 +64,21 @@
 	(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))
-
-;; this does not work on gerd-pcl in cmu 18e+
-#+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)
+;;#-ho-no-svuc
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
 
-    
-    (let ((func (slot-value slot 'value-constraint)))
-      (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))))))
-    )
-
-#+ignore
-(defmethod slot-value-using-class :around ((cl hyperobject-class) obj
-					   (slot standard-effective-slot-definition))
-  (let ((value (call-next-method)))
-    (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
-    value))
+  #+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
+       (prog1
+	   (call-next-method)
+	 (when (direct-rules cl)
+	   (fire-class-rules cl obj slot)))))))