;;;; 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.35 2003/03/31 14:15:07 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
(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)
(,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))
+(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"
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)))