X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=9925c0f99fcd704acd874b26cc6c1685a5d34fcb;hb=da57e4f1ef6bef626996ce87fca1abf225274128;hp=891dc0c11044d778634c0eac4570219c1930048e;hpb=9b510e908bfe486b2d99f870fcd3f512d1ae2fb1;p=hyperobject.git diff --git a/mop.lisp b/mop.lisp index 891dc0c..9925c0f 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.60 2003/04/16 22:00:15 kevin Exp $ +;;;; $Id: mop.lisp,v 1.63 2003/04/25 05:00:58 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg ;;;; @@ -84,7 +84,11 @@ (defclass hyperlink () ((name :type symbol :initform nil :initarg :name :reader name) - (lookup :type (or function symbol) :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))) @@ -233,19 +237,19 @@ 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)))