r3668: *** empty log message ***

diff --git a/hyperobject.asd b/hyperobject.asd
index 76cef90447f3fe85e9937b84d6dcb323ef7e132c..b82cf28969b9e2dece162969e50ddcc842862c6d 100644 (file)
--- a/hyperobject.asd
+++ b/hyperobject.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: hyperobject.asd,v 1.15 2002/12/13 05:44:19 kevin Exp $
+;;;; $Id: hyperobject.asd,v 1.16 2002/12/26 23:18:16 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -22,6 +22,7 @@
     ((:file "package")
      (:file "metaclass" :depends-on ("package"))
      (:file "mop" :depends-on ("metaclass"))
+     (:file "rules" :depends-on ("mop"))
      (:file "connect" :depends-on ("mop"))
      (:file "sql" :depends-on ("connect"))
      (:file "views" :depends-on ("mop"))

diff --git a/mop.lisp b/mop.lisp
index 496bc56c3ae7977205f3a3d34e24051b9701f2f7..54f685979f77a2681d69c6766caf1ee29daa3bb1 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.16 2002/12/14 21:52:48 kevin Exp $
+;;;; $Id: mop.lisp,v 1.17 2002/12/26 23:18:16 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -373,80 +373,3 @@
 (defun hyperobject-class-fields (obj)
   (class-slots (class-of obj)))
 
-;;; Slot accessor and class rules
-
-(defclass rule ()
-  ((name :initarg :name :initform nil :accessor name)
-   (dependants :initarg :dependants :initform nil :accessor dependants)
-   (volatile :initarg :volatile :initform nil :accessor volatile)
-   (access-slots :initarg :access-slots :initform nil :accessor access-slots)
-   (source-code :initarg :source-code :initform nil :accessor source-code)
-   (func :initform nil :initarg :func :accessor func)))
-
-(defun compile-rule (source-code dependants volatile cl)
-  (let ((access (appendnew dependants volatile)))
-    (compile nil
-            (eval
-             `(lambda (obj)
-                (when (every #'(lambda (x) (slot-boundp obj x))
-                             (quote ,dependants))
-                  (with-slots ,access obj
-                    ,@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))))
-
-
-(defun fire-class-rules (cl obj slot)
-  "Fire all class rules. Called after a slot is modified."
-  (let ((name (slot-definition-name slot)))
-    (dolist (rule (rules cl))
-      (when (find name (dependants rule))
-       (cmsg-c :debug "firing rule: ~W" (source-code rule))
-       (funcall (func rule) obj)))))
-
-
-#+ignore
-(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)
-    
-    (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
-        (call-next-method)
-        (when (direct-rules cl)
-          (fire-class-rules cl obj slot))
-        new-value))))
-
-#+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))

diff --git a/rules.lisp b/rules.lisp
new file mode 100644 (file)
index 0000000..11d7dbf
--- /dev/null
+++ b/rules.lisp
@@ -0,0 +1,97 @@
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:          rules.lisp
+;;;; Purpose:       Slot and Class rules
+;;;; Programmer:    Kevin M. Rosenberg
+;;;; Date Started:  Apr 2000
+;;;;
+;;;; $Id: rules.lisp,v 1.1 2002/12/26 23:18:16 kevin Exp $
+;;;;
+;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;;
+;;;; *************************************************************************
+ 
+(in-package :hyperobject)
+
+(eval-when (:compile-toplevel :execute)
+  (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
+
+;;; Slot accessor and class rules
+
+(defclass rule ()
+  ((name :initarg :name :initform nil :accessor name)
+   (dependants :initarg :dependants :initform nil :accessor dependants)
+   (volatile :initarg :volatile :initform nil :accessor volatile)
+   (access-slots :initarg :access-slots :initform nil :accessor access-slots)
+   (source-code :initarg :source-code :initform nil :accessor source-code)
+   (func :initform nil :initarg :func :accessor func)))
+
+(defun compile-rule (source-code dependants volatile cl)
+  (let ((access (appendnew dependants volatile)))
+    (compile nil
+            (eval
+             `(lambda (obj)
+                (when (every #'(lambda (x) (slot-boundp obj x))
+                             (quote ,dependants))
+                  (with-slots ,access obj
+                    ,@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))))
+
+
+(defun fire-class-rules (cl obj slot)
+  "Fire all class rules. Called after a slot is modified."
+  (let ((name (slot-definition-name slot)))
+    (dolist (rule (rules cl))
+      (when (find name (dependants rule))
+       (cmsg-c :debug "firing rule: ~W" (source-code rule))
+       (funcall (func rule) obj)))))
+
+
+#+ignore
+(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)
+    
+    (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
+        (call-next-method)
+        (when (direct-rules cl)
+          (fire-class-rules cl obj slot))
+        new-value))))
+
+#+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))