r5062: return from san diego

[kmrcl.git] / strings.lisp

diff --git a/strings.lisp b/strings.lisp
index e735640189e2aa48582c8cd8b7d191dce697bb50..f933fe824033312ea1a618cb6c56f889f2b1c36c 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.33 2003/05/17 07:34:45 kevin Exp $
+;;;; $Id: strings.lisp,v 1.35 2003/06/06 21:59:30 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,7 +17,7 @@
 ;;;; *************************************************************************
 
 
-(in-package :kmrcl)
+(in-package #:kmrcl)
 
 ;;; Strings
 
@@ -76,8 +76,8 @@
     (setq pos (1+ end))))
 
 
-(defun list-to-delimited-string (list &optional (separator #\space))
-  (format nil (format nil "~~{~~A~~^~A~~}" separator) list))
+(defun list-to-delimited-string (list &optional (separator " "))
+  (format nil (concatenate 'string "~{~A~^" (string separator) "~}") list))
 
 (defun string-invert (str)
   "Invert case of a string"
@@ -201,9 +201,7 @@ list of characters and replacement strings."
 
 (defun escape-xml-string (string)
   "Escape invalid XML characters"
-  (substitute-chars-strings 
-   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;") (#\" . "&quot;"))))
-
+  (substitute-chars-strings string '((#\& . "&amp;") (#\< . "&lt;"))))
 
 (defun make-usb8-array (len)
   (make-array len :adjustable nil
@@ -233,7 +231,8 @@ list of characters and replacement strings."
     vec))
 
 (defun concat-separated-strings (separator &rest lists)
-  (format nil (format nil "~~{~~A~~^~A~~}" separator) (append-sublists lists)))
+  (format nil (concatenate 'string "~{~A~^" (string separator) "~}")
+         (append-sublists lists)))
 
 (defun only-null-list-elements-p (lst)
   (or (null lst) (every #'null lst)))