r4920: Auto commit for Debian build

[hyperobject.git] / rules.lisp

diff --git a/rules.lisp b/rules.lisp
index 539d8cc1ba3d40d0792c0f135e17a1fbb9b789fe..a7bd048579fb5e8053d9d8083b1103da03f7d052 100644 (file)
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.3 2003/04/22 15:18:56 kevin Exp $
+;;;; $Id: rules.lisp,v 1.38 2003/05/04 03:30:28 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,34 +65,22 @@
        (funcall (func rule) obj)))))
 
 
-#+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 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
-        (when (direct-rules cl)
-          (fire-class-rules cl obj slot))
-        new-value))))
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
 
-#+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 (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)))))))