X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=strings.lisp;h=e9a73a3c9c7f1c3041680fc6cc9b5466bb08fe03;hb=e2450e52a0813b8583395d7ac88f24e896f46e13;hp=7310bef870c744d9e4bf2a662e8f0f0a3ca50da0;hpb=61100bfd2f0176c743db058160316a59441ce352;p=kmrcl.git

diff --git a/strings.lisp b/strings.lisp
index 7310bef..e9a73a3 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.52 2003/08/12 06:37:53 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -153,15 +153,30 @@
 (defun is-string-empty (str)
   (zerop (length str)))
 
+(defvar *whitespace-chars* '(#\space #\tab #\return #\linefeed
+			     #+allegro #\%space
+			     #+lispworks #\No-Break-Space))
+
 (defun is-char-whitespace (c) 
   (declare (character c) (optimize (speed 3) (safety 0)))
   (or (char= c #\Space) (char= c #\Tab) (char= c #\Return)
-      (char= c #\Linefeed)))
+      (char= c #\Linefeed)
+      #+allegro (char= c #\%space)
+      #+lispworks (char= c #\No-Break-Space)))
 
 (defun is-string-whitespace (str)
   "Return t if string is all whitespace"
   (every #'is-char-whitespace str))
 
+(defun string-right-trim-whitespace (str)
+  (string-right-trim *whitespace-chars* str))
+
+(defun string-left-trim-whitespace (str)
+  (string-left-trim *whitespace-chars* str))
+
+(defun string-trim-whitespace (str)
+  (string-trim *whitespace-chars* str))
+
 (defun replaced-string-length (str repl-alist)
   (declare (simple-string str)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -412,7 +427,7 @@ for characters in a string"
 	(+ 10 (- code +char-code-upper-a+))
 	(- code +char-code-0+))))
 
-(defun uriencode-string (query)
+(defun encode-uri-string (query)
   "Escape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -435,7 +450,7 @@ for characters in a string"
 	    (setf (schar str dpos) (hexchar (logand c 15))))
 	(setf (schar str dpos) ch)))))
 
-(defun uridecode-string (query)
+(defun decode-uri-string (query)
   "Unescape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -591,3 +606,24 @@ for characters in a string"
         (push (subseq string token-start token-end) tokens)))))
 
 
+
+(defun collapse-whitespace (s)
+  "Convert multiple whitespace characters to a single space character."
+  (declare (simple-string s)
+	   (optimize (speed 3) (safety 0)))
+  (with-output-to-string (stream)
+    (do ((pos 0 (1+ pos))
+	 (in-white nil)
+	 (len (length s)))
+	((= pos len))
+      (declare (fixnum pos len))
+      (let ((c (schar s pos)))
+	(declare (character c))
+	(cond
+	 ((kl:is-char-whitespace c)
+	  (unless in-white
+	    (write-char #\space stream))
+	  (setq in-white t))
+	 (t
+	  (setq in-white nil)
+	  (write-char c stream)))))))