X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=bbd6604adfe6a7356a5d050be84d1645d5c5c34c;hb=2710f01699cb548df453b64786a2eb0e711315a5;hp=b9c8116d990d593669c62ca5cada1e7b5a44fe1b;hpb=3f4394e0246c029c40eeade98ef0778356bf3238;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index b9c8116..bbd6604 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.18 2003/03/29 04:00:37 kevin Exp $
+;;;; $Id: mop.lisp,v 1.36 2003/04/01 16:56:46 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,13 +281,34 @@
        (setf (slot-value ,the-instance ,the-slot-name)
 	   (,reader ,@keys)))))
 
-#+(or sbcl scl cmu)
-(defparameter *queued-definitions* nil)
-#+(or sbcl scl cmu)
-(defun process-queued-definitions ()
-  (dolist (def *queued-definitions*)
-    (eval def))
-  (setq *queued-definitions* nil))
+#+lispworks
+(defun intern-eql-specializer (slot)
+  `(eql ,slot))
+
+#+(or sbcl scl cmu lispworks)
+(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"
@@ -305,12 +326,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 lispworks)
+	      (eval
+	       `(hyperobject::def-lazy-reader ,(name-class subobject)
+		 ,(name-slot subobject) ,(lookup subobject)
+		 ,@(lookup-keys subobject)))
+	      #+(or sbcl cmu scl lispworks)
+	      (apply #'ensure-lazy-reader 
+		     (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
+	      )
 	    (push subobject subobjects))))
       subobjects)))