X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=49dd87d50beadc3994b27f9921d4c97b64f0aa3e;hb=ae806c523aa7162f356b95ba8826e393ab55e420;hp=496bc56c3ae7977205f3a3d34e24051b9701f2f7;hpb=5a20b2bd0d0859d58da60fd22ab37658673ef291;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 496bc56..49dd87d 100644
--- 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.20 2003/03/29 04:20:19 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -281,6 +281,16 @@
        (setf (slot-value ,the-instance ,the-slot-name)
 	   (,reader ,@keys)))))
 
+#+(or sbcl scl cmu)
+(defparameter *queued-definitions* nil)
+
+(defun process-queued-definitions ()
+  #+(or sbcl scl cmu)
+  (progn
+    (dolist (def *queued-definitions*)
+      (eval def))
+    (setq *queued-definitions* nil)))
+
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
   (setf (subobjects cl)
@@ -297,6 +307,12 @@
 							   nil
 							   (cdr subobj-def)))))
 	    (unless (eq (lookup subobject) t)
+	      #+(or sbcl scl cmu)
+	      (push `(def-lazy-reader ,(name-class subobject)
+		      ,(name-slot subobject) ,(lookup subobject)
+		      ,@(lookup-keys subobject))
+		    *queued-definitions*)	      
+	      #-(or sbcl scl cmu)
 	      (eval `(def-lazy-reader ,(name-class subobject)
 			 ,(name-slot subobject) ,(lookup subobject)
 			 ,@(lookup-keys subobject))))
@@ -373,80 +389,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))