r4306: Auto commit for Debian build

[hyperobject.git] / mop.lisp

diff --git a/mop.lisp b/mop.lisp
index 0208286c6d4142fbc0aa8a93f8d3814e1c18b46c..bbd6604adfe6a7356a5d050be84d1645d5c5c34c 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.19 2003/03/29 04:06:29 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,14 +281,34 @@
        (setf (slot-value ,the-instance ,the-slot-name)
           (,reader ,@keys)))))
 
-#+(or sbcl scl cmu)
-(defparameter *queued-definitions* nil)
+#+lispworks
+(defun intern-eql-specializer (slot)
+  `(eql ,slot))
 
-(defun process-queued-definitions ()
-  #+(or sbcl scl cmu)
-  (dolist (def *queued-definitions*)
-    (eval def))
-  (setq *queued-definitions* nil))
+#+(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"
@@ -306,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)))