r4920: Auto commit for Debian build

[hyperobject.git] / rules.lisp

diff --git a/rules.lisp b/rules.lisp
index b42d3615cf503ee32f48f767548ff750c7b1baae..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.27 2003/04/23 20:11:22 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,21 +65,15 @@
        (funcall (func rule) obj)))))
 
 
-(defmethod (setf slot-value-using-class) :around
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  ;; this does not work on gerd-pcl in cmu 18e+
-  (esd-value-constraint slot)
-  (call-next-method))
 
-#+ignore
-(defmethod (setf slot-value-using-class) :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 (esd-value-constraint slot)))
-    (call-next-method)
+  (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"
@@ -90,12 +84,3 @@
           (call-next-method)
         (when (direct-rules cl)
           (fire-class-rules cl obj slot)))))))
-
-
-
-#+ignore
-(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))