r2995: *** empty log message ***

[kmrcl.git] / ml-class.lisp

diff --git a/ml-class.lisp b/ml-class.lisp
index 525ff16cfd69f08bdd44c217a9d0ab227bf40ca6..84845b6d573e77cac0d58691280ec097b689ceb0 100644 (file)
--- 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.4 2002/10/10 16:23:48 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.7 2002/10/13 23:08:40 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -24,6 +24,10 @@
 
 (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)
   ((title :initarg :title :type string :reader ml-std-title
@@ -61,6 +65,21 @@ 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: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)
+
+#+cmu
+(defmethod pcl:validate-superclass ((class pcl::standard-class) (superclass ml-class))
+  t)
+
+#+sbcl
+(defmethod sb-pcl:validate-superclass ((class sb-pcl::standard-class) (superclass ml-class))
+  t)
 
 #+allegro
 (defmethod mop:finalize-inheritance :after ((cl ml-class))
@@ -70,10 +89,20 @@ 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::class-finalized-p ((cl ml-class))
+  (with-slots (wrapper fmtstr-text) cl
+      (and (not (null wrapper))
+          (not (null fmtstr-text)))))
+
 #+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))
+
 #+lispworks
 (defmethod clos:process-a-class-option ((class ml-class)
                                        (name (eql :title))
@@ -219,56 +248,56 @@ 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)
-  (awhen (slot-value (class-of obj) 'title)
+  (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
 
@@ -276,7 +305,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
   (string-downcase (subseq name :start 1)))
   
 (defmethod ml-class-stdname ((cl standard-object))
-  (string-downcase (subseq (class-name (class-of cl)) :start 1)))
+  (string-downcase (subseq (class-name (ml-class-of cl)) :start 1)))
   
 ;;;; Generic Print functions
 
@@ -379,18 +408,15 @@ 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 (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 (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 (class-name (ml-class-of x)))) (ml-class-title x) nitems))
 
 (defclass xmlformat (textformat) 
   ()
@@ -412,10 +438,6 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
     :obj-data-fmtstr-labels #'ml-class-fmtstr-xml-labels
     :obj-data-value-func #'ml-class-xmlvalue-func))
 
-(defclass xmlrefformat (xmlformat)
-  ()
-  (:default-initargs :link-ref (make-instance 'xml-link-ref)))
-
 (defclass link-ref ()
   ((fmtstr :type function :initarg :fmtstr :accessor fmtstr)
    (fmtstr-labels :type function :initarg :fmtstr-labels :accessor fmtstr-labels)
@@ -446,6 +468,15 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
     :ampersand "&"))
 
 
+(defclass htmlrefformat (htmlformat)
+  ()
+  (:default-initargs :link-ref (make-instance 'html-link-ref)))
+
+(defclass xmlrefformat (xmlformat)
+  ()
+  (:default-initargs :link-ref (make-instance 'xml-link-ref)))
+
+
 ;;; File Start and Ends
 
 (defmethod fmt-file-start ((fmt dataformat) (s stream)))