r5312: *** empty log message ***

[lml2.git] / utils.lisp

diff --git a/utils.lisp b/utils.lisp
index 2a6877fefa71ffec67082d44a23742f0911b21f3..0eef8e48f6bc930c8d64af243c3fcff9d735ae61 100644 (file)
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg\r
 ;;;; Date Started:  June 2002\r
 ;;;;\r
-;;;; $Id: utils.lisp,v 1.4 2003/07/15 04:28:56 kevin Exp $\r
+;;;; $Id: utils.lisp,v 1.5 2003/07/15 21:49:36 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of LML2, is copyrighted and open-source software.\r
 ;;;; Rights of modification and redistribution are in the LICENSE file.\r
@@ -73,7 +73,17 @@
   #-(or allegro clisp cmu scl sbcl cormanlisp lispworks lucid mcl) (truename "."))\r
 \r
 \r
-\r
+#+ignore\r
 (defun fformat (&rest args)\r
   (declare (dynamic-extent args))\r
-  (apply #'format args))\r
+  (apply (if (find-package 'kmrcl)\r
+            (symbol-function (intern (symbol-name #:fformat)\r
+                                     (symbol-name #:kmrcl)))\r
+            #'format)\r
+        args))\r
+\r
+(defmacro fformat (stream control-string &rest args)\r
+  (if stream\r
+      `(funcall (formatter ,control-string) ,stream ,@args)\r
+      `(format nil ,control-string ,@args)))\r
+  \r