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

diff --git a/strings.lisp b/strings.lisp
index 96aae86..f382fe9 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.19 2003/05/05 20:08:17 kevin Exp $
+;;;; $Id: strings.lisp,v 1.25 2003/05/09 00:05:13 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,20 +44,17 @@
 	  (setq in-word nil))))
     n-words))
 
-#+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))
-
-(defun #-allegro  delimited-string-to-list
-       #+allegro my-delimited-string-to-list
-       (string &optional (separator #\space) skip-terminal)
+;; From Larry Hunter with modifications
+(defun position-char (char string start max)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+	   (fixnum start max) (simple-string string))
+  (do* ((i start (1+ i)))
+       ((= i max) nil)
+    (declare (fixnum i))
+    (when (char= char (schar string i)) (return i))))
+
+(defun 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)
@@ -65,12 +62,12 @@ my algorithm. Does allegro use assembly?"
   (do* ((len (length string))
 	(output '())
 	(pos 0)
-	(end (position separator string :start pos :end len)
-	     (position separator string :start pos :end len)))
+	(end (position-char separator string pos len)
+	     (position-char separator string pos len)))
        ((null end)
 	(if (< pos len)
 	    (push (subseq string pos) output)
-	    (unless (or skip-terminal (null output))
+	    (when (or (not skip-terminal) (zerop len))
 	      (push "" output)))
 	(nreverse output))
     (declare (type fixnum pos len)
@@ -233,3 +230,24 @@ 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 only-null-list-elements-p (lst)
+  (or (null lst) (every #'null lst)))
+
+(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 (only-null-list-elements-p (cdr rest-lists))
+		   (only-null-list-elements-p (cdr rest-lists))))
+       ((null rest-lists) 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)))))