X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=rules.lisp;h=246ecb366c0d0fb02599c341ca94be82e7b76ecf;hb=0817a8721cbefca2205dcde535ff6b164033abef;hp=722a4210078ce35b3165c41ef803284c75b4ef64;hpb=cd6808ca495d1e87294b17610dc34d3dc5dc4c15;p=hyperobject.git

diff --git a/rules.lisp b/rules.lisp
index 722a421..246ecb3 100644
--- a/rules.lisp
+++ b/rules.lisp
@@ -7,16 +7,12 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: rules.lisp,v 1.25 2003/04/22 18:47:26 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)
@@ -64,22 +58,16 @@
 	(cmsg-c :debug "firing rule: ~W" (source-code rule))
 	(funcall (func rule) obj)))))
 
+
+;;#-ho-no-svuc
 #+ignore
 (defmethod (setf slot-value-using-class) :around
     (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
-  (call-next-method))
-
-;; this does not work on gerd-pcl in cmu 18e+
-(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 (slot-value slot 'value-constraint)))
-    (call-next-method)
-    #+ignore
+  (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"
@@ -90,10 +78,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))