X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=9c031164a11b1adede58e4811314baf0d46addc0;hp=08aec10ea8e92262ebcb92097ab5effab402f63c;hb=a377884abb0f3f36a67d335214bf2936b7c32070;hpb=f1df14311133f4f843e06d1b9b75375ab182f767

diff --git a/strings.lisp b/strings.lisp
index 08aec10..9c03116 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.42 2003/06/15 13:49:42 kevin Exp $
+;;;; $Id: strings.lisp,v 1.46 2003/07/08 00:12:51 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -169,7 +169,6 @@
 
 (defun replaced-string-length (str repl-alist)
   (declare (simple-string str)
-	   (fixnum orig-len new-len)
 	   (optimize (speed 3) (safety 0) (space 0)))
     (do* ((i 0 (1+ i))
 	  (orig-len (length str))
@@ -180,7 +179,8 @@
 	     (match (assoc c repl-alist :test #'char=)))
 	(declare (character c))
 	(when match
-	  (incf new-len (1- (length (cdr match))))))))
+	  (incf new-len (1- (length
+			     (the simple-string (cdr match)))))))))
 
 (defun substitute-chars-strings (str repl-alist)
   "Replace all instances of a chars with a string. repl-alist is an assoc
@@ -274,7 +274,8 @@ Leading zeros are present."
   (do* ((zero-code (char-code #\0))
 	(result (make-string len :initial-element #\0))
 	(minus? (minusp num))
-	(val (if minus? (- 0 num) num) (floor (/ val 10)))
+	(val (if minus? (- num) num)
+	     (nth-value 0 (floor val 10)))
 	(pos (1- len) (1- pos))
 	(mod (mod val 10) (mod val 10)))
       ((or (zerop val) (minusp pos))
@@ -289,11 +290,13 @@ Leading zeros are present."
   "Outputs a string of LEN digit with an optional initial character PCHAR.
 Leading zeros are present."
   (declare (optimize (speed 3) (safety 0) (space 0))
-	   (type fixnum len) (type integer num))
+	   (type fixnum len)
+	   (type integer num))
   (do* ((zero-code (char-code #\0))
 	(result (make-string len :initial-element #\0))
 	(minus? (minusp num))
-	(val (if minus? (- 0 num) num) (floor (/ val 10)))
+	(val (if minus? (- 0 num) num)
+	     (nth-value 0 (floor val 10)))
 	(pos (1- len) (1- pos))
 	(mod (mod val 10) (mod val 10)))
       ((or (zerop val) (minusp pos))
@@ -320,9 +323,9 @@ Leading zeros are present."
 
 (defun string-delimited-string-to-list (str substr)
   "splits a string delimited by substr into a list of strings"
-  #+ignore
   (declare (simple-string str substr)
-	   (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)))
+	   (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0)
+		     (debug 0)))
   (do* ((substr-len (length substr))
 	(strlen (length str))
 	(output '())
@@ -352,7 +355,8 @@ Leading zeros are present."
 	(when (and i (< i end))
 	  (push (subseq str i end) results))
 	(nreverse results))
-    (declare (fixnum i j end))
+    (declare (fixnum end)
+	     (type (or fixnum null) i j))
     (push (subseq str i j) results)))
 
 (defun string-starts-with (start str)
@@ -376,6 +380,7 @@ Leading zeros are present."
   "Return a count of the number of times a predicate is true
 for characters in a string"
   (declare (simple-string s)
+	   (type (or function symbol) pred)
 	   (optimize (speed 3) (safety 0) (space 0)))
   (do ((len (length s))
        (i 0 (1+ i))
@@ -398,6 +403,18 @@ for characters in a string"
   (declare (type (integer 0 15) n))
   (schar +hex-chars+ n))
 
+(defconstant +char-code-0+ (char-code #\0))
+(defconstant +char-code-upper-a+ (char-code #\A))
+(declaim (type fixnum +char-code-0+ +char-code-upper-a+))
+
+(defun charhex (ch)
+  "convert hex character to decimal"
+  (let ((code (char-code (char-upcase ch))))
+    (declare (fixnum ch)) 
+    (if (>= code +char-code-upper-a+)
+	(+ 10 (- code +char-code-upper-a+))
+	(- code +char-code-0+))))
+
 (defun escape-uri-field (query)
   "Escape non-alphanumeric characters for URI fields"
   (declare (simple-string query)
@@ -421,3 +438,68 @@ for characters in a string"
 	    (setf (schar str dpos) (hexchar (logand c 15))))
 	(setf (schar str dpos) ch)))))
 
+(defun unescape-uri-field (query)
+  "Unescape non-alphanumeric characters for URI fields"
+  (declare (simple-string query)
+	   (optimize (speed 3) (safety 0) (space 0)))
+  (do* ((count (count-string-char query #\%))
+	(len (length query))
+	(new-len (- len (* 2 count)))
+	(str (make-string new-len))
+	(spos 0 (1+ spos))
+	(dpos 0 (1+ dpos)))
+      ((= spos len) str)
+    (declare (fixnum count len new-len spos dpos)
+	     (simple-string str))
+    (let ((ch (schar query spos)))
+      (if (char= #\% ch)
+	  (let ((c1 (charhex (schar query (1+ spos))))
+		(c2 (charhex (schar query (+ spos 2)))))
+	    (declare (fixnum c1 c2))
+	    (setf (schar str dpos)
+		  (code-char (logior c2 (ash c1 4))))
+	    (incf spos 2))
+	(setf (schar str dpos) ch)))))
+
+
+(defconstant +char-code-a+ (char-code #\a))
+
+(defun random-string (&optional (len 10))
+  "Returns a random lower-case string."
+  (declare (optimize (speed 3)))
+  (let ((s (make-string len)))
+    (declare (simple-string s))
+    (dotimes (i len s)
+      (setf (schar s i)
+	    (code-char (+ +char-code-a+ (random 26)))))))
+
+
+(defun first-char (s)
+  (declare (simple-string s))
+  (when (and (stringp s) (plusp (length s)))
+    (schar s 0)))
+
+(defun last-char (s)
+  (declare (simple-string s))
+  (when (stringp s)
+    (let ((len (length s)))
+      (when (plusp len))
+      (schar s (1- len)))))
+
+(defun ensure-string (v)
+  (typecase v
+    (string v)
+    (character (string v))
+    (symbol (symbol-name v))
+    (otherwise (write-to-string v))))
+
+(defun string-left-trim-one-char (char str)
+  (declare (simple-string str))
+  (let* ((len (length str))
+	 (last (1- len)))
+    (declare (fixnum len last))
+    (if (char= char (schar str last))
+	(subseq str 0 last)
+      str)))
+
+