X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=dad93ad91278d862fc1998d333a0536945b551ad;hb=90c2e4c13bd89c48de9fe0da126547447b7b9e01;hp=bf6105cf3361a4c203a60c83704c144eb80ede56;hpb=ea3b9fa709caaff0f7b63acbd60be499d9ea2f06;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index bf6105c..dad93ad 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,16 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.31 2003/04/24 20:30:11 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id$
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
-(in-package :hyperobject)
-
-(eval-when (:compile-toplevel :execute)
-  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+(in-package #:hyperobject)
 
 ;;; Slot accessor and class rules
 
@@ -29,6 +25,7 @@
    (func :initform nil :initarg :func :accessor func)))
 
 (defun compile-rule (source-code dependants volatile cl)
+  (declare (ignore cl))
   (let ((access (appendnew dependants volatile)))
     (compile nil
 	     (eval
@@ -39,21 +36,18 @@
 		     ,@source-code)))))))
   
 (defun finalize-rules (cl)
-  (let* ((direct-rules (direct-rules cl))
-	 (rules '()))
-    (dolist (rule direct-rules)
-      (destructuring-bind (name (&key dependants volatile) &rest source-code)
-	  rule
-	(setf dependants (mklist dependants)
-	      volatile (mklist volatile))
-	(push
-	 (make-instance 'rule :name name :dependants dependants
-			:volatile volatile :source-code source-code
-			:access-slots (appendnew dependants volatile)
-			:func (compile-rule
-			       source-code dependants volatile cl))
-	 rules)))
-    (setf (rules cl) (nreverse rules))))
+  (setf (rules cl)
+    (loop for rule in (direct-rules cl)
+	collect 
+	  (destructuring-bind (name (&key dependants volatile) &rest source-code)
+	      rule
+	    (setf dependants (mklist dependants)
+		  volatile (mklist volatile))
+	    (make-instance 'rule :name name :dependants dependants
+			   :volatile volatile :source-code source-code
+			   :access-slots (appendnew dependants volatile)
+			   :func (compile-rule
+				  source-code dependants volatile cl))))))
 
 
 (defun fire-class-rules (cl obj slot)
@@ -65,15 +59,9 @@
 	(funcall (func rule) obj)))))
 
 
-#+ignore
+#+ho-svuc
 (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
-(defun do-svuc (new-value cl obj slot)
 
   #+ignore
   (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
@@ -83,25 +71,9 @@
       ((and func (not (funcall func new-value)))
        (warn "Rejected change to value of slot ~a of object ~a"
 	     (slot-definition-name slot) obj)
-       (values (slot-value obj (slot-definition-name slot)) nil)
+       (slot-value obj (slot-definition-name slot)))
       (t
-       (values new-value t))))))
-
-
-(defmethod (setf slot-value-using-class) :around 
-    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (multiple-value-bind (value changed-p) (do-svuc new-value cl obj slot)
-    (when changed-p
-      (setq value (call-next-method))
-      (when (direct-rules cl)
-	(fire-class-rules cl obj slot)))
-    value))
-    
-
-
-#+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))
+       (prog1
+	   (call-next-method)
+	 (when (direct-rules cl)
+	   (fire-class-rules cl obj slot)))))))