r5491: *** empty log message ***

[kmrcl.git] / strings.lisp

diff --git a/strings.lisp b/strings.lisp
index 4d999544d0983c9023b54cddac9e1f7136a5781a..7310bef870c744d9e4bf2a662e8f0f0a3ca50da0 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.51 2003/08/09 21:42:43 kevin Exp $
+;;;; $Id: strings.lisp,v 1.52 2003/08/12 06:37:53 kevin Exp $
 ;;;;
 ;;;; 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)
@@ -565,33 +560,33 @@ for characters in a string"
 
 (defun lex-string (string &key (whitespace '(#\space #\newline)))
   "Separates a string at whitespace and returns a list of strings"
-  (flet ((whitespace? (char) (member char whitespace :test #'char=)))
+  (flet ((is-sep (char) (member char whitespace :test #'char=)))
     (let ((tokens nil))
       (do* ((token-start
-             (position-if-not #'whitespace? string) 
+             (position-if-not #'is-sep string) 
              (when token-end
-               (position-if-not #'whitespace? string :start (1+ token-end))))
+               (position-if-not #'is-sep string :start (1+ token-end))))
             (token-end
              (when token-start
-               (position-if #'whitespace? string :start token-start))
+               (position-if #'is-sep string :start token-start))
              (when token-start
-               (position-if #'whitespace? string :start 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 ((whitespace? (char) (non-alphanumericp char)))
+  (flet ((is-sep (char) (non-alphanumericp char)))
     (let ((tokens nil))
       (do* ((token-start
-             (position-if-not #'whitespace? string) 
+             (position-if-not #'is-sep string) 
              (when token-end
-               (position-if-not #'whitespace? string :start (1+ token-end))))
+               (position-if-not #'is-sep string :start (1+ token-end))))
             (token-end
              (when token-start
-               (position-if #'whitespace? string :start token-start))
+               (position-if #'is-sep string :start token-start))
              (when token-start
-               (position-if #'whitespace? string :start token-start))))
+               (position-if #'is-sep string :start token-start))))
            ((null token-start) (nreverse tokens))
         (push (subseq string token-start token-end) tokens)))))