X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=b443aa0930057dfe9c3da7f172ffd6479bb5960b;hb=409c40b1221545d7230f6e812921d441ba2d5f89;hp=e7a24c5585afb5332500fac4f44b959c4cae0c86;hpb=8c8becc1f2f7d122ec5298bf6a9d540e3cdd6d47;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index e7a24c5..b443aa0 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.25 2003/03/29 07:42:22 kevin Exp $
+;;;; $Id: mop.lisp,v 1.35 2003/03/31 14:15:07 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -194,7 +194,7 @@
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
 						      #+(or allegro lispworks) name
 						      dsds)
-  #+allergo (declare (ignore name))
+  #+allegro (declare (ignore name))
   (let* ((dsd (car dsds))
 	 (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
     (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
@@ -281,29 +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* "~W~%" def))
-
-(defun process-queued-definitions ()
-  (when *queued-definitions-stream*
-    (close *queued-definitions-stream*)
-    (setq *queued-definitions-stream* nil)
-    (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*))
-    ))
+#+(or sbcl scl cmu)
+(defun ensure-lazy-reader (class-name 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 (class-of (find-class class-name))
+					  (find-class class-name)
+					  (intern-eql-specializer slot-name))
+		     ':lambda-list '(the-class the-instance the-slot-name)
+		     ':function (compile nil method-lambda)
+		     init-args-values)))))
 
 (defun finalize-subobjects (cl)
   "Process class subobjects slot"
@@ -321,10 +322,15 @@
 							   nil
 							   (cdr subobj-def)))))
 	    (unless (eq (lookup subobject) t)
-	      (add-definition
+	      #-(or sbcl cmu scl)
+	      (eval
 	       `(hyperobject::def-lazy-reader ,(name-class subobject)
 		 ,(name-slot subobject) ,(lookup subobject)
-		 ,@(lookup-keys 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)))