X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=ml-class.lisp;h=949190b71bdf1e99208a56dcc2cfba3ea8d4c25c;hb=aad2586655fbce7d2930423af649030c50491a55;hp=cfe2ab7455d26a3f12bcba792d63de393ffaf2a1;hpb=5e5cc3c20a925d8af5de153a118fdaf0792dd7e2;p=kmrcl.git diff --git a/ml-class.lisp b/ml-class.lisp index cfe2ab7..949190b 100644 --- a/ml-class.lisp +++ b/ml-class.lisp @@ -11,20 +11,32 @@ ;;;; 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.12 2002/10/14 20:55:12 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))) +(defun ml-class-of (obj) + #-(or cmu sbcl) (class-of obj) + #+sbcl (sb-pcl:class-of obj) + #+cmu (pcl:class-of obj)) -(defclass ml-class (standard-class) +(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) ((title :initarg :title :type string :reader ml-std-title :documentation "Print Title for class") @@ -60,6 +72,23 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (:default-initargs :title nil :fields nil :subobjects-lists nil :ref-fields nil) (:documentation "Metaclass for Markup Language classes.")) +#+cmu +(defmethod pcl:finalize-inheritance :after ((cl ml-class)) + (init-ml-class cl)) + + +#+sbcl +(defmethod sb-pcl:finalize-inheritance :after ((cl ml-class)) + (init-ml-class cl)) + + +#+cmu +(defmethod pcl:validate-superclass ((class ml-class) (superclass pcl::standard-class)) + t) + +#+sbcl +(defmethod sb-pcl:validate-superclass ((class ml-class) (superclass sb-pcl::standard-class)) + t) #+allegro (defmethod mop:finalize-inheritance :after ((cl ml-class)) @@ -69,9 +98,15 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defmethod clos:finalize-inheritance :after ((cl ml-class)) (init-ml-class cl)) -#+cmu -(defmethod pcl:finalize-inheritance :after ((cl ml-class)) - (init-ml-class cl)) +;;#+cmu +;;(defmethod pcl::class-finalized-p ((cl ml-class)) +;; (and (not (null (slot-value cl 'pcl::wrapper))) +;; (not (null (slot-value cl 'fmtstr-text))))) + +;;#+sbcl +;;(defmethod sb-pcl::class-finalized-p ((cl ml-class)) +;; (and (not (null (slot-value cl 'sb-pcl::wrapper))) +;; (not (null (slot-value cl 'fmtstr-text))))) #+lispworks (defmethod clos:process-a-class-option ((class ml-class) @@ -124,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)) @@ -148,48 +184,46 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (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 "" namestr-lower " " value-fmt)) (setq xml-label-str (concatenate 'string " <" 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 "" namestr-lower " <~~a>" value-fmt "~~a>") - (gu:string-append fmtstr-xml-ref-labels " <~~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 "" namestr-lower " <~~a>" value-fmt "~~a>") + (string-append fmtstr-xml-ref-labels " <~~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 - :umlisp namestr) x)))) + (list `(,formatter (,(intern namestr package) x)))) (setq plain-value-func - (list `(,(gu:concat-symbol-pkg - :umlisp namestr) x)))) + (list `(,(intern namestr package) x)))) (setq value-func (append value-func plain-value-func)) (if (eql type :cdata) @@ -197,9 +231,14 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (setq xmlvalue-func (append xmlvalue-func plain-value-func))) )) - (setq value-func `(lambda (x) (values ,@value-func))) + (if value-func + (setq value-func `(lambda (x) (values ,@value-func))) + (setq value-func `(lambda () (values)))) (setq value-func (compile nil (eval value-func))) - (setq xmlvalue-func `(lambda (x) (values ,@xmlvalue-func))) + + (if xmlvalue-func + (setq xmlvalue-func `(lambda (x) (values ,@xmlvalue-func))) + (setq xmlvalue-func `(lambda () (values)))) (setq xmlvalue-func (compile nil (eval xmlvalue-func))) (setf (slot-value cl 'fmtstr-text) fmtstr-text) @@ -218,64 +257,65 @@ Format is ((field-name field-lookup-func other-link-params) ...)") (defun ml-class-fmtstr-text (obj) - (slot-value (class-of obj) 'fmtstr-text)) + (slot-value (ml-class-of obj) 'fmtstr-text)) (defun ml-class-fmtstr-html (obj) - (slot-value (class-of obj) 'fmtstr-html)) + (slot-value (ml-class-of obj) 'fmtstr-html)) (defun ml-class-fmtstr-xml (obj) - (slot-value (class-of obj) 'fmtstr-xml)) + (slot-value (ml-class-of obj) 'fmtstr-xml)) (defun ml-class-fmtstr-text-labels (obj) - (slot-value (class-of obj) 'fmtstr-text-labels)) + (slot-value (ml-class-of obj) 'fmtstr-text-labels)) (defun ml-class-fmtstr-html-labels (obj) - (slot-value (class-of obj) 'fmtstr-html-labels)) + (slot-value (ml-class-of obj) 'fmtstr-html-labels)) (defun ml-class-fmtstr-xml-labels (obj) - (slot-value (class-of obj) 'fmtstr-xml-labels)) + (slot-value (ml-class-of obj) 'fmtstr-xml-labels)) (defun ml-class-value-func (obj) - (slot-value (class-of obj) 'value-func)) + (slot-value (ml-class-of obj) 'value-func)) (defun ml-class-xmlvalue-func (obj) - (slot-value (class-of obj) 'xmlvalue-func)) + (slot-value (ml-class-of obj) 'xmlvalue-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 (ml-class-of obj) 'title) + (if (consp it) + (car it) + it)))) (defun ml-class-subobjects-lists (obj) - (slot-value (class-of obj) 'subobjects-lists)) + (slot-value (ml-class-of obj) 'subobjects-lists)) (defun ml-class-ref-fields (obj) - (slot-value (class-of obj) 'ref-fields)) + (slot-value (ml-class-of obj) 'ref-fields)) (defun ml-class-fields (obj) - (slot-value (class-of obj) 'fields)) + (slot-value (ml-class-of obj) 'fields)) (defun ml-class-fmtstr-html-ref (obj) - (slot-value (class-of obj) 'fmtstr-html-ref)) + (slot-value (ml-class-of obj) 'fmtstr-html-ref)) (defun ml-class-fmtstr-xml-ref (obj) - (slot-value (class-of obj) 'fmtstr-xml-ref)) + (slot-value (ml-class-of obj) 'fmtstr-xml-ref)) (defun ml-class-fmtstr-html-ref-labels (obj) - (slot-value (class-of obj) 'fmtstr-html-ref-labels)) + (slot-value (ml-class-of obj) 'fmtstr-html-ref-labels)) (defun ml-class-fmtstr-xml-ref-labels (obj) - (slot-value (class-of obj) 'fmtstr-xml-ref-labels)) + (slot-value (ml-class-of obj) 'fmtstr-xml-ref-labels)) ;;; Class name functions +(defgeneric ml-class-stdname (x)) (defmethod ml-class-stdname ((name string)) - (string-downcase (subseq name :start 1))) + (string-downcase (subseq name 1))) (defmethod ml-class-stdname ((cl standard-object)) - (string-downcase (subseq (class-name (class-of cl)) :start 1))) + (string-downcase (subseq (ml-class-name (ml-class-of cl)) 1))) ;;;; Generic Print functions @@ -378,22 +418,19 @@ Format is ((field-name field-lookup-func other-link-params) ...)") :obj-data-fmtstr-labels #'ml-class-fmtstr-html-labels :obj-data-value-func #'ml-class-value-func)) -(defclass htmlrefformat (htmlformat) - () - (:default-initargs :link-ref (make-instance 'html-link-ref))) (defun class-name-of (obj) - (string-downcase (class-name (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 (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 (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) () - (: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>