X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=ml-class.lisp;h=949190b71bdf1e99208a56dcc2cfba3ea8d4c25c;hp=c42d2ae25884f46754add3288040090ce98ca71b;hb=3497e18db2a0c64a2595ae8305c15f3069858daa;hpb=e49b463c9cffb466428b69791552f75afd3008d2 diff --git a/ml-class.lisp b/ml-class.lisp index c42d2ae..949190b 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: ml-class.lisp,v 1.11 2002/10/14 19:26:36 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.12 2002/10/14 20:55:12 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -29,6 +29,11 @@ #+sbcl (sb-pcl:class-of obj) #+cmu (pcl:class-of obj)) +(defun ml-class-name (obj) + #-(or cmu sbcl) (class-name obj) + #+sbcl (sb-pcl:class-name obj) + #+cmu (pcl:class-name obj)) + (defclass ml-class (#-(or cmu sbcl) standard-class #+cmu pcl::standard-class #+sbcl sb-pcl::standard-class) @@ -154,7 +159,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (value-func '()) (xmlvalue-func '()) (classname (class-name cl)) - (package (symbol-package (class-name cl))) + (package (symbol-package (ml-class-name cl))) (ref-fields (slot-value cl 'ref-fields))) (declare (ignore classname)) (dolist (f (slot-value cl 'fields)) @@ -310,7 +315,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (string-downcase (subseq name 1))) (defmethod ml-class-stdname ((cl standard-object)) - (string-downcase (subseq (class-name (ml-class-of cl)) 1))) + (string-downcase (subseq (ml-class-name (ml-class-of cl)) 1))) ;;;; Generic Print functions @@ -415,13 +420,13 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defun class-name-of (obj) - (string-downcase (class-name (ml-class-of obj)))) + (string-downcase (ml-class-name (ml-class-of obj)))) (defun xmlformat-list-end-value-func (x) - (format nil "~alist" (string-downcase (class-name (ml-class-of x))))) + (format nil "~alist" (string-downcase (ml-class-name (ml-class-of x))))) (defun xmlformat-list-start-value-func (x nitems) - (values (format nil "~alist" (string-downcase (class-name (ml-class-of x)))) (ml-class-title x) nitems)) + (values (format nil "~alist" (string-downcase (ml-class-name (ml-class-of x)))) (ml-class-title x) nitems)) (defclass xmlformat (textformat) ()