X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=mop.lisp;h=613031565164a14fbadedc754242473ae0cc6ebf;hb=5fe53d4fd03d9339c06850dd54dcbcae10b3678e;hp=0208286c6d4142fbc0aa8a93f8d3814e1c18b46c;hpb=09aedab69b129fc5929a770fab849d6452e1256d;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index 0208286..6130315 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.19 2003/03/29 04:06:29 kevin Exp $
+;;;; $Id: mop.lisp,v 1.28 2003/03/29 20:22:37 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -282,13 +282,27 @@
 	   (,reader ,@keys)))))
 
 #+(or sbcl scl cmu)
-(defparameter *queued-definitions* nil)
-
-(defun process-queued-definitions ()
-  #+(or sbcl scl cmu)
-  (dolist (def *queued-definitions*)
-    (eval def))
-  (setq *queued-definitions* nil))
+(defun ensure-lazy-reader (class slot-name reader &rest reader-keys)
+  (let ((keys nil)
+	(gf (ensure-generic-function 'slot-unbound)))
+    (dolist (key reader-keys)
+      (push (list 'slot-value 'the-instance (list 'quote key)) keys))
+    (setq keys (nreverse keys))
+    (multiple-value-bind (method-lambda init-args-values)
+      (make-method-lambda
+       gf
+       (class-prototype (generic-function-method-class gf))
+       `(lambda (the-class the-instance the-slot-name)
+	 (declare (ignore the-class))
+	 (setf (slot-value the-instance the-slot-name) (,reader ,@keys)))
+       nil)
+	(add-method gf
+		    (apply
+		     #'make-instance (generic-function-method-class gf)
+		     ':specializers (list t class (intern-eql-specializer slot-name))
+		     ':lambda-list '(the-class the-instance the-slot-name)
+		     ':function `(function ,method-lambda)
+		     init-args-values)))))
 
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
@@ -306,12 +320,15 @@
 							   nil
 							   (cdr subobj-def)))))
 	    (unless (eq (lookup subobject) t)
-	      #+(or sbcl scl cmu)
-	      
-	      #-(or sbcl scl cmu)
-	      (eval `(def-lazy-reader ,(name-class subobject)
-			 ,(name-slot subobject) ,(lookup subobject)
-			 ,@(lookup-keys subobject))))
+	      #-(or sbcl cmu scl)
+	      (eval
+	       `(hyperobject::def-lazy-reader ,(name-class subobject)
+		 ,(name-slot subobject) ,(lookup subobject)
+		 ,@(lookup-keys subobject)))
+	      #+(or sbcl cmu scl)
+	      (apply #'ensure-lazy-reader 
+		     (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
+	      )
 	    (push subobject subobjects))))
       subobjects)))