X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=d2149f4b5af600f7c74260428e48afbcea6f66e4;hb=a4c5cb60bc8a39d7907e0c380db2d3d29f1df3af;hp=539d8cc1ba3d40d0792c0f135e17a1fbb9b789fe;hpb=7a47f293050da35c6e7600621e4f555199c36ee4;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 539d8cc..d2149f4 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,10 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.3 2003/04/22 15:18:56 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id: rules.lisp,v 1.40 2003/05/15 06:18:02 kevin Exp $
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -66,33 +65,21 @@
 
 
 #+ignore
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (slot standard-effective-slot-definition))
-    (call-next-method))
+(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 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)
-	 #+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 (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))))
-
-#+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))
+	   (fire-class-rules cl obj slot)))))))