X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=96aae865c3eeb98daa34a4c147b6ebc36d4e6c59;hp=975f1e2dcaad34dd1ff7b98d12ab1975a15cbdd8;hb=b30c91702a68ca81402b646bd7468bfc75c5a804;hpb=4f21397f1d96da80fbac6f587cb384e56208b497

diff --git a/strings.lisp b/strings.lisp
index 975f1e2..96aae86 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.14 2003/04/29 00:49:09 kevin Exp $
+;;;; $Id: strings.lisp,v 1.19 2003/05/05 20:08:17 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)
+	    (unless (or skip-terminal (null output))
+	      (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"
@@ -191,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)