X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=strings.lisp;h=9d8620e1a426ebf8daa916a616ba30f7e837cc85;hb=45326a2fd9e7761899d593d7f528abf455453b0b;hp=f382fe9221dc0e1b48433bcfc15c7fb51ee5a5fa;hpb=0d0bdfdfb15376444d09b8bbbbe4e7034f710dcf;p=kmrcl.git

diff --git a/strings.lisp b/strings.lisp
index f382fe9..9d8620e 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.25 2003/05/09 00:05:13 kevin Exp $
+;;;; $Id: strings.lisp,v 1.34 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -30,19 +30,19 @@
 
 (defun count-string-words (str)
   (declare (simple-string str)
-	   (optimize (speed 3) (safety 0)))
+	   (optimize (speed 3) (safety 0) (space 0)))
   (let ((n-words 0)
 	(in-word nil))
     (declare (fixnum n-words))
-    (dotimes (i (length str))
-      (let ((ch (char str i)))
-	(declare (character ch))
-	(if (alphanumericp ch)
-	    (unless in-word
-	      (incf n-words)
-	      (setq in-word t))
-	  (setq in-word nil))))
-    n-words))
+    (do* ((len (length str))
+	  (i 0 (1+ i)))
+	((= i len) n-words)
+      (declare (fixnum i))
+      (if (alphanumericp (schar str i))
+	  (unless in-word
+	    (incf n-words)
+	    (setq in-word t))
+	(setq in-word nil)))))
 
 ;; From Larry Hunter with modifications
 (defun position-char (char string start max)
@@ -86,8 +86,10 @@
   (let ((up nil) (down nil))
     (block skip
       (loop for char of-type character across str do
-	    (cond ((upper-case-p char) (if down (return-from skip str) (setf up t)))
-		  ((lower-case-p char) (if up   (return-from skip str) (setf down t)))))
+	    (cond ((upper-case-p char)
+		   (if down (return-from skip str) (setf up t)))
+		  ((lower-case-p char)
+		   (if up   (return-from skip str) (setf down t)))))
       (if up (string-downcase str) (string-upcase str)))))
 
 (defun add-sql-quotes (s)
@@ -199,9 +201,7 @@ list of characters and replacement strings."
 
 (defun escape-xml-string (string)
   "Escape invalid XML characters"
-  (substitute-chars-strings 
-   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;") (#\" . "&quot;"))))
-
+  (substitute-chars-strings string '((#\& . "&amp;") (#\< . "&lt;"))))
 
 (defun make-usb8-array (len)
   (make-array len :adjustable nil
@@ -251,3 +251,41 @@ list of characters and replacement strings."
       (write-string elem strm)
       (unless (and last-elem last-list)
 	(write-string separator strm)))))
+
+(defun prefixed-fixnum-string (num pchar len)
+  "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 num len))
+  (when pchar
+    (incf len))
+  (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)))
+	(pos (1- len) (1- pos))
+	(mod (mod val 10) (mod val 10)))
+      ((or (zerop val) (minusp pos))
+       (when pchar
+	 (setf (schar result 0) pchar))
+       (when minus? (setf (schar result (if pchar 1 0)) #\-))
+       result)
+    (declare (fixnum val mod zero-code pos) (simple-string result))
+    (setf (schar result pos) (code-char (+ zero-code mod)))))
+
+(defun integer-string (num len)
+  "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))
+  (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)))
+	(pos (1- len) (1- pos))
+	(mod (mod val 10) (mod val 10)))
+      ((or (zerop val) (minusp pos))
+       (when minus? (setf (schar result (if pchar 1 0)) #\-))
+       result)
+    (declare (fixnum mod zero-code pos) (simple-string result) (integer val))
+    (setf (schar result pos) (code-char (+ zero-code mod)))))