X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=03d9b66a82dca873377e855c24ce2c6af7fcfcae;hp=6ec3f5ce434465fae964e79855d57da64bd5a88a;hb=d11d6cc43fd9227a8aeed28dc2cfecdbc587ec4a;hpb=91e3d8f38e4ccdfbfb9c351e05b487ee899c9e47

diff --git a/strings.lisp b/strings.lisp
index 6ec3f5c..03d9b66 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.49 2003/07/19 20:32:48 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -150,22 +150,17 @@
       (setq hash (+ hash (char-code (char str i)))))
     (logand hash bitmask)))
 
-(defun string-not-null? (str)
-  (and str (not (zerop (length str)))))
-  
-(defun whitespace? (c) 
-  (declare (character c))
-  (locally (declare (optimize (speed 3) (safety 0)))
-    (or (char= c #\Space) (char= c #\Tab) (char= c #\Return)
-	(char= c #\Linefeed))))
+(defun is-string-empty (str)
+  (zerop (length str)))
 
-(defun not-whitespace? (c)
-  (not (whitespace? c)))
+(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)))
 
-(defun string-ws? (str)
+(defun is-string-whitespace (str)
   "Return t if string is all whitespace"
-  (when (stringp str)
-    (null (find-if #'not-whitespace? str))))
+  (every #'is-char-whitespace str))
 
 (defun replaced-string-length (str repl-alist)
   (declare (simple-string str)
@@ -417,7 +412,7 @@ for characters in a string"
 	(+ 10 (- code +char-code-upper-a+))
 	(- code +char-code-0+))))
 
-(defun escape-uri-field (query)
+(defun uriencode-string (query)
   "Escape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -440,7 +435,7 @@ for characters in a string"
 	    (setf (schar str dpos) (hexchar (logand c 15))))
 	(setf (schar str dpos) ch)))))
 
-(defun unescape-uri-field (query)
+(defun uridecode-string (query)
   "Unescape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -551,13 +546,48 @@ for characters in a string"
 (defun shrink-vector (str size)
   #+allegro
   (excl::.primcall 'sys::shrink-svector str size)
-  #+sbcl
-  (sb-kernel:shrink-vector str size)
   #+cmu
   (lisp::shrink-vector str size)
   #+lispworks
   (system::shrink-vector$vector str size)
-  #+(or allegro cmu sbcl lispworks)
-  str
-  #-(or allegro cmu sbcl lispworks)
-  (subseq str 0 size))
+  #+sbcl
+  (sb-kernel:shrink-vector str size)
+  #+scl
+  (common-lisp::shrink-vector str size)
+  #-(or allegro cmu lispworks sbcl scl)
+  (setq str (subseq str 0 size))
+  str)
+
+(defun lex-string (string &key (whitespace '(#\space #\newline)))
+  "Separates a string at whitespace and returns a list of strings"
+  (flet ((is-sep (char) (member char whitespace :test #'char=)))
+    (let ((tokens nil))
+      (do* ((token-start
+             (position-if-not #'is-sep string) 
+             (when token-end
+               (position-if-not #'is-sep string :start (1+ token-end))))
+            (token-end
+             (when token-start
+               (position-if #'is-sep string :start token-start))
+             (when token-start
+               (position-if #'is-sep string :start token-start))))
+           ((null token-start) (nreverse tokens))
+        (push (subseq string token-start token-end) tokens)))))
+
+(defun split-alphanumeric-string (string)
+  "Separates a string at any non-alphanumeric chararacter"
+  (flet ((is-sep (char) (non-alphanumericp char)))
+    (let ((tokens nil))
+      (do* ((token-start
+             (position-if-not #'is-sep string) 
+             (when token-end
+               (position-if-not #'is-sep string :start (1+ token-end))))
+            (token-end
+             (when token-start
+               (position-if #'is-sep string :start token-start))
+             (when token-start
+               (position-if #'is-sep string :start token-start))))
+           ((null token-start) (nreverse tokens))
+        (push (subseq string token-start token-end) tokens)))))
+
+