X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=d2149f4b5af600f7c74260428e48afbcea6f66e4;hb=a4c5cb60bc8a39d7907e0c380db2d3d29f1df3af;hp=833621c2f971e3223caa6ad7d2a40b1ca8fdf1e1;hpb=11434225af98a2cb3858c78d94373afe37d2999f;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 833621c..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.35 2003/04/25 05:29:02 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,23 +65,14 @@
 
 
 #+ignore
-(defmethod (setf slot-value-using-class) :around
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (call-next-method))
-
-;; required for cmucl18e+ work-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)
-	  ;; The following causes an error with sbcl
-	  #+ignore
-	  (when (slot-boundp slot 'value-constraint)
-	    (esd-value-constraint slot))))
+  (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"
@@ -93,11 +83,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))