;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: ml-class.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.4 2002/10/10 16:23:48 kevin Exp $
;;;;
-;;;; This file, part of Webutils, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
-;;;; Webutils users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; KMRCL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package :webutils)
+(in-package :kmrcl)
(declaim (optimize (speed 3) (safety 1)))
(if first-field
(setq first-field nil)
(progn
- (gu:string-append fmtstr-text " ")
- (gu:string-append fmtstr-html " ")
- (gu:string-append fmtstr-xml " ")
- (gu:string-append fmtstr-text-labels " ")
- (gu:string-append fmtstr-html-labels " ")
- (gu:string-append fmtstr-xml-labels " ")
- (gu:string-append fmtstr-html-ref " ")
- (gu:string-append fmtstr-xml-ref " ")
- (gu:string-append fmtstr-html-ref-labels " ")
- (gu:string-append fmtstr-xml-ref-labels " ")))
+ (string-append fmtstr-text " ")
+ (string-append fmtstr-html " ")
+ (string-append fmtstr-xml " ")
+ (string-append fmtstr-text-labels " ")
+ (string-append fmtstr-html-labels " ")
+ (string-append fmtstr-xml-labels " ")
+ (string-append fmtstr-html-ref " ")
+ (string-append fmtstr-xml-ref " ")
+ (string-append fmtstr-html-ref-labels " ")
+ (string-append fmtstr-xml-ref-labels " ")))
(setq html-str value-fmt)
(setq xml-str (concatenate 'string "<" namestr-lower ">" value-fmt "</" namestr-lower ">"))
(setq html-label-str (concatenate 'string "<i>" namestr-lower "</i> " value-fmt))
(setq xml-label-str (concatenate 'string "<label>" namestr-lower "</label> <" namestr-lower ">" value-fmt "</" namestr-lower ">"))
- (gu:string-append fmtstr-text value-fmt)
- (gu:string-append fmtstr-html html-str)
- (gu:string-append fmtstr-xml xml-str)
- (gu:string-append fmtstr-text-labels namestr-lower " " value-fmt)
- (gu:string-append fmtstr-html-labels html-label-str)
- (gu:string-append fmtstr-xml-labels xml-label-str)
+ (string-append fmtstr-text value-fmt)
+ (string-append fmtstr-html html-str)
+ (string-append fmtstr-xml xml-str)
+ (string-append fmtstr-text-labels namestr-lower " " value-fmt)
+ (string-append fmtstr-html-labels html-label-str)
+ (string-append fmtstr-xml-labels xml-label-str)
(if (find name ref-fields :key #'car)
(progn
- (gu:string-append fmtstr-html-ref "<~~a>" value-fmt "</~~a>")
- (gu:string-append fmtstr-xml-ref "<~~a>" value-fmt "</~~a>")
- (gu:string-append fmtstr-html-ref-labels "<i>" namestr-lower "</i> <~~a>" value-fmt "</~~a>")
- (gu:string-append fmtstr-xml-ref-labels "<label>" namestr-lower "</label> <~~a>" value-fmt "</~~a>"))
+ (string-append fmtstr-html-ref "<~~a>" value-fmt "</~~a>")
+ (string-append fmtstr-xml-ref "<~~a>" value-fmt "</~~a>")
+ (string-append fmtstr-html-ref-labels "<i>" namestr-lower "</i> <~~a>" value-fmt "</~~a>")
+ (string-append fmtstr-xml-ref-labels "<label>" namestr-lower "</label> <~~a>" value-fmt "</~~a>"))
(progn
- (gu:string-append fmtstr-html-ref html-str)
- (gu:string-append fmtstr-xml-ref xml-str)
- (gu:string-append fmtstr-html-ref-labels html-label-str)
- (gu:string-append fmtstr-xml-ref-labels xml-label-str)))
+ (string-append fmtstr-html-ref html-str)
+ (string-append fmtstr-xml-ref xml-str)
+ (string-append fmtstr-html-ref-labels html-label-str)
+ (string-append fmtstr-xml-ref-labels xml-label-str)))
(if formatter
(setq plain-value-func
- (list `(,formatter (,(gu:concat-symbol-pkg
+ (list `(,formatter (,(concat-symbol-pkg
:umlisp namestr) x))))
(setq plain-value-func
- (list `(,(gu:concat-symbol-pkg
+ (list `(,(concat-symbol-pkg
:umlisp namestr) x))))
(setq value-func (append value-func plain-value-func))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun ml-class-title (obj)
- (gu:awhen (slot-value (class-of obj) 'title)
- (if (consp gu:it)
- (car gu:it)
- gu:it))))
+ (awhen (slot-value (class-of obj) 'title)
+ (if (consp it)
+ (car it)
+ it))))
(defun ml-class-subobjects-lists (obj)
(slot-value (class-of obj) 'subobjects-lists))
(defclass xmlformat (textformat)
()
- (:default-initargs :file-start-str "" ; (gu:std-xml-header)
+ (:default-initargs :file-start-str "" ; (std-xml-header)
:list-start-indent t
:list-start-fmtstr "<~a><title>~a~p:</title> ~%"
:list-start-value-func #'xmlformat-list-start-value-func
(defmethod fmt-file-start ((fmt dataformat) (s stream)))
(defmethod fmt-file-start ((fmt textformat) (s stream))
- (gu:aif (file-start-str fmt)
- (format s gu::it)))
+ (aif (file-start-str fmt)
+ (format s it)))
(defmethod fmt-file-end ((fmt textformat) (s stream))
- (gu:aif (file-end-str fmt)
- (format s gu::it)))
+ (aif (file-end-str fmt)
+ (format s it)))
;;; List Start and Ends
(defmethod fmt-list-start (x (fmt textformat) (s stream) &optional (indent 0) (num-items 1))
(if (list-start-indent fmt)
- (gu:indent-spaces indent s))
- (gu:aif (list-start-fmtstr fmt)
- (apply #'format s gu::it
+ (indent-spaces indent s))
+ (aif (list-start-fmtstr fmt)
+ (apply #'format s it
(multiple-value-list
(funcall (list-start-value-func fmt) x num-items)))))
(defmethod fmt-list-end (x (fmt textformat) (s stream) &optional (indent 0) (num-items 1))
(declare (ignore num-items))
(if (list-end-indent fmt)
- (gu:indent-spaces indent s))
- (gu:aif (list-end-fmtstr fmt)
- (apply #'format s gu::it
+ (indent-spaces indent s))
+ (aif (list-end-fmtstr fmt)
+ (apply #'format s it
(multiple-value-list
(funcall (list-end-value-func fmt) x)))))
(defmethod fmt-obj-start (x (fmt textformat) (s stream) &optional (indent 0))
(if (obj-start-indent fmt)
- (gu:indent-spaces indent s))
- (gu:aif (obj-start-fmtstr fmt)
- (apply #'format s gu::it
+ (indent-spaces indent s))
+ (aif (obj-start-fmtstr fmt)
+ (apply #'format s it
(multiple-value-list
(funcall (obj-start-value-func fmt) x)))))
(defmethod fmt-obj-end (x (fmt textformat) (s stream) &optional (indent 0))
(if (obj-end-indent fmt)
- (gu:indent-spaces indent s))
- (gu:aif (obj-end-fmtstr fmt)
- (apply #'format s gu::it
+ (indent-spaces indent s))
+ (aif (obj-end-fmtstr fmt)
+ (apply #'format s it
(multiple-value-list
(funcall (obj-end-value-func fmt) x)))))
(if refvars
(let ((varstr ""))
(dolist (var refvars)
- (gu:string-append varstr (format nil "~a~a=~a"
+ (string-append varstr (format nil "~a~a=~a"
(ampersand ref) (car var) (cadr var))))
varstr)
"")))
(defmethod fmt-obj-data (x (fmt textformat) s
&optional (indent 0) (label nil) (refvars nil))
(if (obj-data-indent fmt)
- (gu:indent-spaces indent s))
+ (indent-spaces indent s))
(if (link-ref fmt)
(fmt-obj-data-with-ref x fmt s label refvars)
(fmt-obj-data-plain x fmt s label))
- (gu:aif (obj-data-end-fmtstr fmt)
- (format s gu::it)))
+ (aif (obj-data-end-fmtstr fmt)
+ (format s it)))
(defmethod fmt-obj-data-plain (x (fmt textformat) s label)
(if label
(defmethod load-all-subobjects (objs)
"Load all subobjects if they have not already been loaded."
(when objs
- (let ((objlist (gu:mklist objs)))
+ (let ((objlist (mklist objs)))
(dolist (obj objlist)
- (gu:awhen (ml-class-subobjects-lists obj) ;; access list of functions
- (dolist (child-obj gu::it) ;; for each child function
- (gu:awhen (funcall (car child-obj) obj)
- (load-all-subobjects gu:it))))))
+ (awhen (ml-class-subobjects-lists obj) ;; access list of functions
+ (dolist (child-obj it) ;; for each child function
+ (awhen (funcall (car child-obj) obj)
+ (load-all-subobjects it))))))
objs))
(defmethod output-ml-class (objs (fmt dataformat) (strm stream)
(indent 0) (subobjects nil) (refvars nil))
"Display a single or list of ml-class instances and their subobjects"
(when objs
- (setq objs (gu:mklist objs))
+ (setq objs (mklist objs))
(let ((nobjs (length objs)))
(fmt-list-start (car objs) fmt strm indent nobjs)
(dolist (obj objs)
(fmt-obj-start obj fmt strm indent)
(fmt-obj-data obj fmt strm (1+ indent) label refvars)
(if subobjects
- (gu:awhen (ml-class-subobjects-lists obj) ;; access list of functions
- (dolist (child-obj gu::it) ;; for each child function
- (gu:awhen (funcall (car child-obj) obj) ;; access set of child objects
- (output-ml-class gu::it fmt strm label
+ (awhen (ml-class-subobjects-lists obj) ;; access list of functions
+ (dolist (child-obj it) ;; for each child function
+ (awhen (funcall (car child-obj) obj) ;; access set of child objects
+ (output-ml-class it fmt strm label
english-only-function
(1+ indent) subobjects refvars)))))
(fmt-obj-end obj fmt strm indent)))
projects / kmrcl.git / blobdiff