r4594: Auto commit for Debian build

[hyperobject.git] / rules.lisp

diff --git a/rules.lisp b/rules.lisp
index 11d7dbfa5ab6266f7b3bf03d3e65572b9fcb219a..3edec6407688f6d9476d2491cb279642d9b66838 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.1 2002/12/26 23:18:16 kevin Exp $
+;;;; $Id: rules.lisp,v 1.19 2003/04/22 15:52:20 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -65,7 +65,6 @@
        (funcall (func rule) obj)))))
 
 
-#+ignore
 (defmethod (setf slot-value-using-class) 
     :around (new-value (cl hyperobject-class) obj
                       (slot standard-effective-slot-definition))
@@ -76,18 +75,21 @@
                       (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)))
+
+    (let ((func (slot-value slot 'value-constraint)))
+      (call-next-method)
+      #+ignore
       (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)
-        (when (direct-rules cl)
-          (fire-class-rules cl obj slot))
-        new-value))))
+        (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