X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=da39d48edd98a1b56cbd1153944cd0d7630a2d83;hp=e12d9d9aeee29c2db549e0bad4410ae9ac67ff44;hb=ba354a40a203103a4cf16cd3d21f89f707ba5205;hpb=2359ec8676836fb4a99ea8c9450fadd35a3d248f

diff --git a/strings.lisp b/strings.lisp
index e12d9d9..da39d48 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -1,4 +1,4 @@
-;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+<;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.23 2003/05/08 19:19:08 kevin Exp $
+;;;; $Id: strings.lisp,v 1.32 2003/05/16 12:51:11 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -30,34 +30,31 @@
 
 (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))
-
-#+allegro
-(defun delimited-string-to-list (string &optional (separator #\space) skip-terminal)
-  "Uses allegro's internal function since that benchmarks faster than
-my algorithm. Does allegro use assembly?"
-  (declare (string string) (character separator))
-  (when skip-terminal
-    (let ((len (length string)))
-      (when (and (plusp len) (char= separator (char string (1- len))))
-	(setq string (subseq string 0 (1- len))))))
-  (excl:delimited-string-to-list string separator))
-
-(defun #-allegro  delimited-string-to-list
-       #+allegro my-delimited-string-to-list
-       (string &optional (separator #\space) skip-terminal)
+    (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)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+	   (fixnum start max) (simple-string string))
+  (do* ((i start (1+ i)))
+       ((= i max) nil)
+    (declare (fixnum i))
+    (when (char= char (schar string i)) (return i))))
+
+(defun delimited-string-to-list (string &optional (separator #\space) 
+						  skip-terminal)
   "split a string with delimiter"
   (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0))
 	   (type string string)
@@ -65,8 +62,8 @@ my algorithm. Does allegro use assembly?"
   (do* ((len (length string))
 	(output '())
 	(pos 0)
-	(end (position separator string :start pos :end len)
-	     (position separator string :start pos :end len)))
+	(end (position-char separator string pos len)
+	     (position-char separator string pos len)))
        ((null end)
 	(if (< pos len)
 	    (push (subseq string pos) output)
@@ -89,8 +86,10 @@ my algorithm. Does allegro use assembly?"
   (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)
@@ -254,3 +253,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)))))