r8632: updates

[kmrcl.git] / strings.lisp

diff --git a/strings.lisp b/strings.lisp
index 87d325425c8e7902b9ea06542952e31836aa408e..4ef18f0134e586755ab1cb9177e82ff53ca11b10 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -153,12 +153,16 @@
 (defun is-string-empty (str)
   (zerop (length str)))
 
-(defvar *whitespace-chars* '(#\space #\tab #\return #\linefeed))
+(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"
@@ -423,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)))
@@ -446,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)))
@@ -472,9 +476,9 @@ for characters in a string"
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defvar +unambigous-charset+
+  (defvar +unambiguous-charset+
     "abcdefghjkmnpqrstuvwxyz123456789ABCDEFGHJKLMNPQSRTUVWXYZ")
-  (defconstant +unambigous-length+ (length +unambigous-charset+)))
+  (defconstant +unambiguous-length+ (length +unambiguous-charset+)))
 
 (defun random-char (&optional (set :lower-alpha))
   (ecase set
@@ -487,8 +491,8 @@ for characters in a string"
         (code-char (+ +char-code-lower-a+ n)))))
     (:upper-alpha
      (code-char (+ +char-code-upper-a+ (random 26))))
-    (:unambigous
-     (schar +unambigous-charset+ (random +unambigous-length+)))
+    (:unambiguous
+     (schar +unambiguous-charset+ (random +unambiguous-length+)))
     (:upper-lower-alpha
      (let ((n (random 52)))
        (if (>= n 26)
@@ -548,11 +552,24 @@ for characters in a string"
        
 
 (defun string-maybe-shorten (str maxlen)
-  (let ((len (length str)))
-    (if (<= len maxlen)
-       str
-      (concatenate 'string (subseq str 0 (- maxlen 3)) "..."))))
+  (string-elide str maxlen :end))
 
+(defun string-elide (str maxlen position)
+  (declare (fixnum maxlen))
+  (let ((len (length str)))
+    (declare (fixnum len))
+    (cond
+     ((<= len maxlen)
+      str)
+     ((<= maxlen 3)
+      "...")
+     ((eq position :middle)
+      (multiple-value-bind (mid remain) (truncate maxlen 2)
+       (let ((end1 (- mid 1))
+             (start2 (- len (- mid 2) remain))) 
+         (concatenate 'string (subseq str 0 end1) "..." (subseq str start2)))))
+     ((or (eq position :end) t)
+      (concatenate 'string (subseq str 0 (- maxlen 3)) "...")))))
 
 (defun shrink-vector (str size)
   #+allegro
@@ -602,3 +619,31 @@ 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)))))))
+
+(defun string->list (string)
+  (let ((eof (list nil)))
+    (with-input-from-string (stream string)
+      (do ((x (read stream nil eof) (read stream nil eof))
+           (l nil (cons x l)))
+          ((eq x eof) (nreverse l))))))