r4824: Auto commit for Debian build

[kmrcl.git] / strings.lisp

diff --git a/strings.lisp b/strings.lisp
index 94eaed406718924b34aca52e8cf03c02afe8880b..a9acdc27281ad98ef62d1d963d569f0e55fb20a0 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.12 2003/04/29 00:43:56 kevin Exp $
+;;;; $Id: strings.lisp,v 1.21 2003/05/06 01:43:14 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,31 +44,43 @@
          (setq in-word nil))))
     n-words))
 
-#+excl
-(defun delimited-string-to-list (string &optional (separator #\space))
+#+allegro
+(defun delimited-string-to-list (string &optional (separator #\space) skip-terminal)
+  "Uses allegro's internal function since that benchmarks faster than
+my algorithm. Does allegro use assembly?"
+  (declare (string string) (character separator))
+  (when skip-terminal
+    (let ((len (length string)))
+      (when (and (plusp len) (char= separator (char string (1- len))))
+       (setq string (subseq string 0 (1- len))))))
   (excl:delimited-string-to-list string separator))
 
-#-excl
-(defun delimited-string-to-list (sequence &optional (separator #\space))
-  "Split a string by a delimitor"
-  (loop
-      with start = 0
-      for end = (position separator sequence :start start)
-      collect (subseq sequence start end)
-      until (null end)
-      do
-    (setf start (1+ end))))
-
-#+excl
-(defun list-to-delimited-string (list &optional (separator #\space))
-  (excl:list-to-delimited-string list separator))
+(defun #-allegro  delimited-string-to-list
+       #+allegro my-delimited-string-to-list
+       (string &optional (separator #\space) skip-terminal)
+  "split a string with delimiter"
+  (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0))
+          (type string string)
+          (type character separator))
+  (do* ((len (length string))
+       (output '())
+       (pos 0)
+       (end (position separator string :start pos :end len)
+            (position separator string :start pos :end len)))
+       ((null end)
+       (if (< pos len)
+           (push (subseq string pos) output)
+           (when (or (not skip-terminal) (zerop len))
+             (push "" output)))
+       (nreverse output))
+    (declare (type fixnum pos len)
+            (type (or null fixnum) end))
+    (push (subseq string pos end) output)
+    (setq pos (1+ end))))
+
 
-#-excl
 (defun list-to-delimited-string (list &optional (separator #\space))
-  (if (consp list)
-      (let ((fmt (format nil "~~A~~{~A~~A~~}" separator)))
-       (format nil fmt (first list) (rest list)))
-      ""))
+  (format nil (format nil "~~{~~A~~^~A~~}" separator) list))
 
 (defun string-invert (str)
   "Invert case of a string"
@@ -113,7 +125,14 @@
   (let ((len (length s)))
     (if (plusp len)
        (subseq s 0 (1- len))
-       s))
+       s)))
+
+(defun nstring-trim-last-character (s)
+  "Return the string less the last character"
+  (let ((len (length s)))
+    (if (plusp len)
+       (nsubseq s 0 (1- len))
+       s)))
 
 (defun string-hash (str &optional (bitmask 65535))
   (let ((hash 0))
@@ -184,7 +203,7 @@ list of characters and replacement strings."
 (defun escape-xml-string (string)
   "Escape invalid XML characters"
   (substitute-chars-strings 
-   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;"))))
+   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;") (#\" . "&quot;"))))
 
 
 (defun make-usb8-array (len)
@@ -214,3 +233,20 @@ list of characters and replacement strings."
       (setf (aref vec i) (char-code (schar str i))))
     vec))
 
+(defun concat-separated-strings (separator &rest lists)
+  (format nil (format nil "~~{~~A~~^~A~~}" separator) (append-sublists lists)))
+
+(defun print-separated-strings (strm separator &rest lists)
+  (declare (optimize (speed 3) (safety 0) (space 0) (debug 0)
+                    (compilation-speed 0)))
+  (do* ((rest-lists lists (cdr rest-lists))
+       (list (car rest-lists) (car rest-lists))
+       (last-list (null (cdr rest-lists)) (null (cdr rest-lists))))
+       ((null list) strm)
+    (do* ((lst list (cdr lst))
+         (elem (car lst) (car lst))
+         (last-elem (null (cdr lst)) (null (cdr lst))))
+        ((null lst))
+      (write-string elem strm)
+      (unless (and last-elem last-list)
+       (write-string separator strm)))))