X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=rules.lisp;h=13300a5beb008ea6805ac153e3247dcc977e26a7;hb=ab93461bcc3ba943fd571735f3bff0849d0313a4;hp=a20ec7fdf326516cfeb716f29b470fbdaa905e28;hpb=2825a7d2feacb81a52e6757ba0041dacd0c33ca1;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index a20ec7f..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.33 2003/04/25 03:35:10 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,22 +64,14 @@
 	(funcall (func rule) obj)))))
 
 
-#+ignore
-(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))
-
-;; required for cmucl18e+ work-around
+;;#-ho-no-svuc
 (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 (when (slot-boundp slot 'value-constraint)
-		(esd-value-constraint slot))))
+  (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"
@@ -91,16 +82,3 @@
 	   (call-next-method)
 	 (when (direct-rules cl)
 	   (fire-class-rules cl obj slot)))))))
-
-
-(defmethod (setf slot-value-using-class) :around 
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (do-svuc new-value 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))