X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=strings.lisp;h=bfd7c984541a5e4a8abcb268ef37bec740cea132;hb=5f0d98408c20ff43709fc654978d1a5e4a675f2d;hp=8af34976b6bd83e10863a8bf0a7eddfbce7540ec;hpb=9a080059e2396d4145fdfacf9a3c61cb745b9484;p=kmrcl.git

diff --git a/strings.lisp b/strings.lisp
index 8af3497..bfd7c98 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.24 2003/05/08 23:35:18 kevin Exp $
+;;;; $Id: strings.lisp,v 1.30 2003/05/16 08:37:20 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,29 +44,17 @@
 	  (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))
-
 ;; From Larry Hunter with modifications
 (defun position-char (char string start max)
-  (declare (optimize (speed 3) (safety 0))
+  (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 #-allegro  delimited-string-to-list
-       #+allegro my-delimited-string-to-list
-       (string &optional (separator #\space) skip-terminal)
+(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)
@@ -98,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)
@@ -263,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)))))