X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=strings.lisp;h=48a29107a419dc110a0e71176b4d690a20672c32;hb=0f12822c9d49849c26424743b3744d26056be4cc;hp=bf10d058b85d29ba1da086f9cbc00195ce58540b;hpb=6729a4cf6ca2361b36a8ada705e7325b62c2fe54;p=kmrcl.git

diff --git a/strings.lisp b/strings.lisp
index bf10d05..48a2910 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.41 2003/06/15 07:48:30 kevin Exp $
+;;;; $Id: strings.lisp,v 1.44 2003/06/17 13:56:38 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))
@@ -392,11 +397,11 @@ for characters in a string"
   (not (alphanumericp ch)))
 
 (defvar +hex-chars+ "0123456789ABCDEF")
-(declaim (type (simple-array character 16) +hex-chars+))
+(declaim (type simple-string +hex-chars+))
 
 (defun hexchar (n)
   (declare (type (integer 0 15) n))
-  (aref +hex-chars+ n))
+  (schar +hex-chars+ n))
 
 (defun escape-uri-field (query)
   "Escape non-alphanumeric characters for URI fields"
@@ -421,3 +426,25 @@ for characters in a string"
 	    (setf (schar str dpos) (hexchar (logand c 15))))
 	(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 (+ +code-char-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)))))