X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=strings.lisp;h=6348eecdc4cbbc30cd4aa04adbb7beadf7b5916c;hb=d3a88acfecf83fc695ca7b6e247ec735c85625bf;hp=a9acdc27281ad98ef62d1d963d569f0e55fb20a0;hpb=ca0dcaef675ae959bb83754254fb68cb5f0ec670;p=kmrcl.git

diff --git a/strings.lisp b/strings.lisp
index a9acdc2..6348eec 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.21 2003/05/06 01:43:14 kevin Exp $
+;;;; $Id: strings.lisp,v 1.26 2003/05/11 21:51:44 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,8 +62,8 @@ 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)
@@ -89,8 +86,10 @@ my algorithm. Does allegro use assembly?"
   (let ((up nil) (down nil))
     (block skip
       (loop for char of-type character across str do
-	    (cond ((upper-case-p char) (if down (return-from skip str) (setf up t)))
-		  ((lower-case-p char) (if up   (return-from skip str) (setf down t)))))
+	    (cond ((upper-case-p char)
+		   (if down (return-from skip str) (setf up t)))
+		  ((lower-case-p char)
+		   (if up   (return-from skip str) (setf down t)))))
       (if up (string-downcase str) (string-upcase str)))))
 
 (defun add-sql-quotes (s)
@@ -236,13 +235,17 @@ list of characters and replacement strings."
 (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 (null (cdr rest-lists)) (null (cdr rest-lists))))
-       ((null list) strm)
+	(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))))