;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: mop.lisp,v 1.52 2003/04/15 05:18:22 kevin Exp $
+;;;; $Id: mop.lisp,v 1.64 2003/04/28 19:06:13 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
(defclass subobject ()
((name-class :type symbol :initform nil :initarg :name-class :reader name-class)
(name-slot :type symbol :initform nil :initarg :name-slot :reader name-slot)
- (lookup :type symbol :initform nil :initarg :lookup :reader lookup)
+ (lookup :type (or function symbol) :initform nil :initarg :lookup :reader lookup)
(lookup-keys :type list :initform nil :initarg :lookup-keys
:reader lookup-keys))
(:documentation "Contains subobject information"))
(defclass hyperlink ()
((name :type symbol :initform nil :initarg :name :reader name)
- (lookup :type function :initform nil :initarg :lookup :reader lookup)
+ (lookup
+ ;; The type specifier seems to break sbcl
+ :type (or function symbol)
+ ;; :type t
+ :initform nil :initarg :lookup :reader lookup)
(link-parameters :type list :initform nil :initarg :link-parameters
:reader link-parameters)))
value-type
(car value-type))
((:string :cdata :varchar :char)
- 'string)
+ '(or null string))
(:character
- 'character)
+ '(or null character))
(:fixnum
- 'fixnum)
+ '(or null fixnum))
(:boolean
- 'boolean)
+ '(or null boolean))
(:integer
- 'integer)
+ '(or null integer))
((:float :single-float)
- 'single-float)
+ '(or null single-float))
(:double-float
- 'double-float)
+ '(or null double-float))
(otherwise
t)))
`(defmethod slot-unbound (,the-class (,the-instance ,class)
(,the-slot-name (eql ',slot-name)))
(declare (ignore ,the-class))
- (setf (slot-value ,the-instance ,the-slot-name)
- (,reader ,@keys)))))
+ (setf (slot-value ,the-instance ,the-slot-name) (,reader ,@keys)))))
+
#+lispworks
(defun intern-eql-specializer (slot)
(setf (subobjects cl)
(let ((subobjects '()))
(dolist (slot (class-slots cl))
- (let-when (subobj-def (esd-subobject slot))
- (let ((subobject (make-instance 'subobject
- :name-class (class-name cl)
- :name-slot (slot-definition-name slot)
- :lookup (if (atom subobj-def)
- subobj-def
- (car subobj-def))
- :lookup-keys (if (atom subobj-def)
- nil
- (cdr subobj-def)))))
- (unless (eq (lookup subobject) t)
- #-(or sbcl cmu lispworks)
- (eval
- `(hyperobject::def-lazy-reader ,(name-class subobject)
- ,(name-slot subobject) ,(lookup subobject)
- ,@(lookup-keys subobject)))
- #+(or sbcl cmu lispworks)
- (apply #'ensure-lazy-reader
- (name-class subobject) (name-slot subobject) (lookup subobject) (lookup-keys subobject))
- )
- (push subobject subobjects))))
+ (let-when
+ (subobj-def (esd-subobject slot))
+ (let ((subobject
+ (make-instance 'subobject
+ :name-class (class-name cl)
+ :name-slot (slot-definition-name slot)
+ :lookup (if (atom subobj-def)
+ subobj-def
+ (car subobj-def))
+ :lookup-keys (if (atom subobj-def)
+ nil
+ (cdr subobj-def)))))
+ (unless (eq (lookup subobject) t)
+ #-(or sbcl cmu lispworks)
+ (eval
+ `(hyperobject::def-lazy-reader ,(name-class subobject)
+ ,(name-slot subobject) ,(lookup subobject)
+ ,@(lookup-keys subobject)))
+ #+(or sbcl cmu lispworks)
+ (apply #'ensure-lazy-reader
+ (name-class subobject) (name-slot subobject)
+ (lookup subobject) (lookup-keys subobject)))
+ (push subobject subobjects))))
;; sbcl/cmu reverse class-slots compared to the defclass form
- ;; subobject is already reversed from the dolist/push loop, so re-reverse on cmu/sbcl
+ ;; so re-reverse on cmu/sbcl
#+(or cmu sbcl) subobjects
#-(or cmu sbcl) (nreverse subobjects)
)))