;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: mop.lisp,v 1.49 2003/04/14 17:10:54 kevin Exp $
+;;;; $Id: mop.lisp,v 1.69 2003/05/06 22:19:09 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)))
(init-hyperobject-class cl)
)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (when (>= (length (generic-function-lambda-list
+ (ensure-generic-function
+ 'compute-effective-slot-definition)))
+ 3)
+ (pushnew :ho-normal-cesd cl:*features*))
+
+ (when (>= (length (generic-function-lambda-list
+ (ensure-generic-function
+ 'direct-slot-definition-class)))
+ 3)
+ (pushnew :ho-normal-dsdc cl:*features*))
+
+ (when (>= (length (generic-function-lambda-list
+ (ensure-generic-function
+ 'effective-slot-definition-class)))
+ 3)
+ (pushnew :ho-normal-esdc cl:*features*)))
+
;; Slot definitions
-(defmethod direct-slot-definition-class ((cl hyperobject-class)
- #+allegro &rest
- iargs)
+(defmethod direct-slot-definition-class ((cl hyperobject-class)
+ #+ho-normal-dsdc &rest iargs)
(find-class 'hyperobject-dsd))
+(defmethod effective-slot-definition-class ((cl hyperobject-class)
+ #+ho-normal-esdc &rest iargs)
+ (find-class 'hyperobject-esd))
- ; Slot definitions
+
+;;; Slot definitions
(eval-when (:compile-toplevel :load-toplevel :execute)
(defmacro process-class-option (slot-name &optional required)
(t
t)))
-(defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
- #-(or scl) name
- dsds)
+#+ignore
+(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds)
#+allegro (declare (ignore name))
(let* ((dsd (car dsds))
(value-type (canonicalize-value-type (slot-value dsd 'value-type))))
:value-constraint (slot-value dsd 'value-constraint)
:null-allowed (slot-value dsd 'null-allowed)
ia)))))
-
+
+(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds)
+ #+ho-normal-cesd (declare (ignore name))
+ (let* ((esd (call-next-method))
+ (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)
+ (setf (slot-value esd 'sql-type) sql-type)
+ (setf (slot-value esd 'length) length)
+ (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
+ (setf (slot-value esd 'value-type) value-type)
+ (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters description user-name
+ value-constraint index null-allowed))
+ (setf (slot-value esd name) (slot-value dsd name)))
+ esd)))
+
+
+#+ho-normal-cesd
+(setq cl:*features* (delete :ho-normal-cesd cl:*features*))
+#+ho-normal-dsdc
+(setq cl:*features* (delete :ho-normal-dsdc cl:*features*))
+#+ho-normal-esdc
+(setq cl:*features* (delete :ho-normal-esdc cl:*features*))
+
+(defun lisp-type-is-a-string (type)
+ (or (eq type 'string)
+ (and (listp type) (some #'(lambda (x) (eq x 'string)) type))))
+
(defun value-type-to-lisp-type (value-type)
(case (if (atom value-type)
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)
)))