From a4567a953b33e74df0d533046e27dc3ad7651a9a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 18 Oct 2002 07:31:42 +0000 Subject: [PATCH] r3103: *** empty log message *** --- ml-class.lisp | 24 ++++++++++++++++-------- web-utils-aserve.lisp | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ml-class.lisp b/ml-class.lisp index 39878fa..9b5f085 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.20 2002/10/17 00:25:05 kevin Exp $ +;;;; $Id: ml-class.lisp,v 1.21 2002/10/18 07:28:57 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -25,17 +25,17 @@ (declaim (optimize (speed 3) (safety 1))) (defun ml-class-of (obj) - #-(or cmu sbcl scl) (class-of obj) + #-(or cmu sbcl) (class-of obj) #+sbcl (sb-pcl:class-of obj) - #+(or cmu scl) (pcl:class-of obj)) + #+cmu (pcl:class-of obj)) (defun ml-class-name (obj) - #-(or cmu sbcl scl) (class-name obj) + #-(or cmu sbcl) (class-name obj) #+sbcl (sb-pcl:class-name obj) - #+(or cmu scl) (pcl:class-name obj)) + #+cmu (pcl:class-name obj)) (defclass ml-class (#-(or cmu sbcl) standard-class - #+(or cmu scl) pcl::standard-class + #+cmu pcl::standard-class #+sbcl sb-pcl::standard-class) ((title :initarg :title :type string :reader ml-std-title :documentation @@ -72,20 +72,28 @@ 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.")) -#+(or cmu scl) +#+cmu (defmethod pcl:finalize-inheritance :after ((cl ml-class)) (init-ml-class cl)) +#+scl +(defmethod clos:finalize-inheritance :after ((cl ml-class)) + (init-ml-class cl)) + #+sbcl (defmethod sb-pcl:finalize-inheritance :after ((cl ml-class)) (init-ml-class cl)) -#+(or cmu slc) +#+cmu (defmethod pcl:validate-superclass ((class ml-class) (superclass pcl::standard-class)) t) +#+scl +(defmethod clos:validate-superclass ((class ml-class) (superclass standard-class)) + t) + #+sbcl (defmethod sb-pcl:validate-superclass ((class ml-class) (superclass sb-pcl::standard-class)) t) diff --git a/web-utils-aserve.lisp b/web-utils-aserve.lisp index 6548662..6ace751 100644 --- a/web-utils-aserve.lisp +++ b/web-utils-aserve.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: web-utils-aserve.lisp,v 1.9 2002/10/18 05:14:49 kevin Exp $ +;;;; $Id: web-utils-aserve.lisp,v 1.10 2002/10/18 07:28:57 kevin Exp $ ;;;; ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -65,11 +65,11 @@ ; (format *html-stream* "Return to Home") `(case ,format (:xml - (princ-http "") ,@body - (princ-http "")) + (princ-http "")) (:ie-xml (princ-http "