X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=949190b71bdf1e99208a56dcc2cfba3ea8d4c25c;hb=7549b1d1644073df554a5df612a35961bc1adbbf;hp=bab9ca619497c66de58c58edadb52e9aec4cbfeb;hpb=c555c542d6703f47ed6140955dd9e92471422859;p=kmrcl.git

diff --git a/ml-class.lisp b/ml-class.lisp
index bab9ca6..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.10 2002/10/14 15:25:11 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,6 +159,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
 	  (value-func '())
 	  (xmlvalue-func '())
 	  (classname (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))
@@ -215,11 +221,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
 	  
 	  (if formatter
 	      (setq plain-value-func 
-		(list `(,formatter (,(concat-symbol-pkg 
-				      :umlisp namestr) x))))
+		(list `(,formatter (,(intern namestr package) x))))
 	    (setq plain-value-func 
-	      (list `(,(concat-symbol-pkg 
-			:umlisp namestr) x))))
+	      (list `(,(intern namestr package) x))))
 	  (setq value-func (append value-func plain-value-func))
 	  
 	  (if (eql type :cdata)
@@ -311,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
 
@@ -416,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) 
   ()