r4280: Auto commit for Debian build

[hyperobject.git] / mop.lisp

diff --git a/mop.lisp b/mop.lisp
index 543221aa6a91442e1252ff4db19a986ebabe2c84..5a42585e302e4f2dcf47ec28667feeddd0a1599b 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.14 2002/12/14 02:30:58 kevin Exp $
+;;;; $Id: mop.lisp,v 1.23 2003/03/29 07:17:47 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -281,6 +281,30 @@
        (setf (slot-value ,the-instance ,the-slot-name)
           (,reader ,@keys)))))
 
+
+(defparameter *queued-definitions-pathname*
+  (make-pathname :directory '(:absolute "tmp")
+                :name (format nil "hyperobject-def-~d" (get-universal-time))
+                :type "lisp"))
+(defparameter *queued-definitions-stream* nil)
+
+(defun add-definition (def)
+  (unless *queued-definitions-stream*
+    (setq *queued-definitions-stream* (open *queued-definitions-pathname*
+                                           :direction :output
+                                           :if-exists :supersede))
+    (format *queued-definitions-stream* "(in-package #:hyperobject)~%"))
+  (format *queued-definitions-stream* "~A~%" def))
+
+(defun process-queued-definitions ()
+  (when *queued-definitions-stream*
+    (close *queued-definitions-stream*)
+    (compile-file *queued-definitions-pathname*)
+    (load (compile-file-pathname *queued-definitions-pathname*))
+;;    (delete-file *queued-definitions-pathname*) 
+;;    (delete-file (compile-file-pathname *queued-definitions-pathname*))
+    (setq *queued-definitions-stream* nil)))
+
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
   (setf (subobjects cl)
@@ -297,9 +321,10 @@
                                                           nil
                                                           (cdr subobj-def)))))
            (unless (eq (lookup subobject) t)
-             (eval `(def-lazy-reader ,(name-class subobject)
-                        ,(name-slot subobject) ,(lookup subobject)
-                        ,@(lookup-keys subobject))))
+             (add-definition
+              `(def-lazy-reader ,(name-class subobject)
+                ,(name-slot subobject) ,(lookup subobject)
+                ,@(lookup-keys subobject))))
            (push subobject subobjects))))
       subobjects)))
 
@@ -373,62 +398,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)
-   (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)
-  #'(lambda (obj)
-      `(with-slots ,(append dependants volatile) 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
-                       :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."
-  (dolist (rule (direct-rules cl))
-    (cmsg "firing rule: ~a" rule)))
-
-(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)
-        (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))