X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=blobdiff_plain;f=rules.lisp;h=dad93ad91278d862fc1998d333a0536945b551ad;hp=a748560ac323201e357b0c4a56bd62527f218a8b;hb=4cd076b20dcd4d686fb684bdc82b86a9b30acfe0;hpb=f598c27dcc9fce561496c3b87b18f3cdb9a4e744

diff --git a/rules.lisp b/rules.lisp
index a748560..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.13 2003/04/22 15:38:34 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,35 +59,21 @@
 	(funcall (func rule) obj)))))
 
 
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (slot standard-effective-slot-definition))
-    (call-next-method))
-
-(defmethod (setf slot-value-using-class) 
-    :around (new-value (cl hyperobject-class) obj
-		       (slot standard-effective-slot-definition))
-    #+ignore
-    (cmsg-c :verbose "Setf slot value: class: ~s, obj: ~s, slot: ~s, value: ~s" cl (class-of obj) slot new-value)
+#+ho-svuc
+(defmethod (setf slot-value-using-class) :around
+    (new-value (cl hyperobject-class) obj (slot hyperobject-esd))
 
-    (slot-value slot '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"
-	       (slot-definition-name slot) obj)
-	 (slot-value obj (slot-definition-name slot)))
-	(t
-	 (prog1
-	     (call-next-method)
-	   (when (direct-rules cl)
-	     (fire-class-rules cl obj slot)))))))
-
-#+ignore
-(defmethod slot-value-using-class :around ((cl hyperobject-class) obj
-					   (slot standard-effective-slot-definition))
-  (let ((value (call-next-method)))
-    (cmsg-c :verbose "slot value: class: ~s, obj: ~s, slot: ~s" cl (class-of obj) slot)
-    value))
+  #+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)))
+    (cond
+      ((and func (not (funcall func new-value)))
+       (warn "Rejected change to value of slot ~a of object ~a"
+	     (slot-definition-name slot) obj)
+       (slot-value obj (slot-definition-name slot)))
+      (t
+       (prog1
+	   (call-next-method)
+	 (when (direct-rules cl)
+	   (fire-class-rules cl obj slot)))))))