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

diff --git a/strings.lisp b/strings.lisp
index d8c0e43..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.9 2003/04/28 21:12:27 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
 ;;;;
@@ -18,7 +18,6 @@
 
 
 (in-package :kmrcl)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
 
 ;;; Strings
 
@@ -31,45 +30,54 @@
 
 (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))
-
-#+excl
-(defun delimited-string-to-list (string &optional (separator #\space))
-  (excl:delimited-string-to-list string separator))
-
-#-excl
-(defun delimited-string-to-list (sequence &optional (separator #\space))
-  "Split a string by a delimitor"
-  (loop
-      with start = 0
-      for end = (position separator sequence :start start)
-      collect (subseq sequence start end)
-      until (null end)
-      do
-    (setf start (1+ end))))
-
-#+excl
-(defun list-to-delimited-string (list &optional (separator #\space))
-  (excl:list-to-delimited-string list separator))
+    (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)
+	   (type character separator))
+  (do* ((len (length string))
+	(output '())
+	(pos 0)
+	(end (position-char separator string pos len)
+	     (position-char separator string pos len)))
+       ((null end)
+	(if (< pos len)
+	    (push (subseq string pos) output)
+	    (when (or (not skip-terminal) (zerop len))
+	      (push "" output)))
+	(nreverse output))
+    (declare (type fixnum pos len)
+	     (type (or null fixnum) end))
+    (push (subseq string pos end) output)
+    (setq pos (1+ end))))
+
 
-#-excl
 (defun list-to-delimited-string (list &optional (separator #\space))
-  (if (consp list)
-      (let ((fmt (format nil "~~A~~{~A~~A~~}" separator)))
-	(format nil fmt (first list) (rest list)))
-      ""))
+  (format nil (format nil "~~{~~A~~^~A~~}" separator) list))
 
 (defun string-invert (str)
   "Invert case of a string"
@@ -78,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)
@@ -90,12 +100,7 @@
 
 (defun substitute-string-for-char (procstr match-char subst-str) 
   "Substitutes a string for a single matching character of a string"
-  (let ((pos (position match-char procstr)))
-    (if pos
-	(concatenate 'string
-	  (subseq procstr 0 pos) subst-str
-	  (substitute-string-for-char (subseq procstr (1+ pos)) match-char subst-str))
-      procstr)))
+  (substitute-chars-strings procstr (list (cons match-char subst-str))))
 
 (defun string-substitute (string substring replacement-string)
   "String substitute by Larry Hunter. Obtained from Google"
@@ -114,10 +119,19 @@
 	  replacement-string))
       (setq last-end (+ next-start substring-length)))))
 
-
 (defun string-trim-last-character (s)
-"Return the string less the last character"
-  (subseq s 0 (1- (length s))))
+  "Return the string less the last character"
+  (let ((len (length s)))
+    (if (plusp len)
+	(subseq s 0 (1- len))
+	s)))
+
+(defun nstring-trim-last-character (s)
+  "Return the string less the last character"
+  (let ((len (length s)))
+    (if (plusp len)
+	(nsubseq s 0 (1- len))
+	s)))
 
 (defun string-hash (str &optional (bitmask 65535))
   (let ((hash 0))
@@ -133,8 +147,9 @@
   
 (defun whitespace? (c) 
   (declare (character c))
-  (declare (optimize (speed 3) (safety 0)))
-  (or (char= c #\Space) (char= c #\Tab) (char= c #\Return) (char= c #\Linefeed)))
+  (locally (declare (optimize (speed 3) (safety 0)))
+    (or (char= c #\Space) (char= c #\Tab) (char= c #\Return)
+	(char= c #\Linefeed))))
 
 (defun not-whitespace? (c)
   (not (whitespace? c)))
@@ -144,9 +159,7 @@
   (when (stringp str)
     (null (find-if #'not-whitespace? str))))
 
-(defun string-replace-chars-strings (str repl-alist)
-  "Replace all instances of a chars with a string. repl-alist is an assoc
-list of characters and replacement strings."
+(defun replaced-string-length (str repl-alist)
   (declare (string str))
   (let* ((orig-len (length str))
 	 (new-len orig-len))
@@ -157,65 +170,40 @@ list of characters and replacement strings."
 	     (match (assoc c repl-alist :test #'char=)))
 	(declare (character c))
 	(when match
-	  (incf new-len (length (cdr match))))))
-    (let ((new-string (make-string new-len))
-	  (i 0))
-      (declare (string new-string)
-	       (fixnum i))
-      (dotimes (i orig-len)
-	(declare (fixnum i))
-	(let* ((c (char str i))
-	       (match (assoc c repl-alist :test #'char=)))
-	  (declare (character c))
-	  (if match
-	      (let* ((subst (cdr match))
-		     (len (length match)))
-		(dotimes (j len)
-		  (setf (char new-string i) (char subst j))
-		  (incf i))
-		(decf i))
-	    (progn
-	      (setf (char new-string i) c)))))
-      new-string)))
+	  (incf new-len (1- (length (cdr match)))))))
+    new-len))
+
+(defun substitute-chars-strings (str repl-alist)
+  "Replace all instances of a chars with a string. repl-alist is an assoc
+list of characters and replacement strings."
+  (declare (simple-string str))
+  (do* ((orig-len (length str))
+	(new-string (make-string (replaced-string-length str repl-alist)))
+	(spos 0 (1+ spos))
+	(dpos 0))
+      ((>= spos orig-len)
+       new-string)
+    (declare (fixnum spos dpos) (simple-string new-string))
+    (let* ((c (char str spos))
+	   (match (assoc c repl-alist :test #'char=)))
+      (declare (character c))
+      (if match
+	  (let* ((subst (cdr match))
+		 (len (length subst)))
+	    (declare (fixnum len))
+	    (dotimes (j len)
+	      (declare (fixnum j))
+	      (setf (char new-string dpos) (char subst j))
+	      (incf dpos)))
+	(progn
+	  (setf (char new-string dpos) c)
+	  (incf dpos))))))
 
 (defun escape-xml-string (string)
   "Escape invalid XML characters"
-  (string-replace-char-string
-   (string-replace-char-string string #\& "&amp;")
-   #\< "&lt;"))
-
-(defun string-replace-char-string (string repl-char repl-str)
-  "Replace all occurances of repl-char with repl-str"
- (declare (simple-string string))
-  (let ((count (count repl-char string)))
-    (declare (fixnum count))
-    (if (zerop count)
-	string
-	(locally (declare (optimize (speed 3) (safety 0)))
-	  (let* ((old-length (length string))
-		 (repl-length (length repl-str))
-		 (new-string (make-string (the fixnum
-					    (+ old-length
-					       (the fixnum
-						 (* count
-						    (the fixnum (1- repl-length)))))))))
-	    (declare (fixnum old-length repl-length)
-		     (simple-string new-string))
-	    (let ((newpos 0))
-	      (declare (fixnum newpos))
-	      (dotimes (oldpos (length string))
-		(declare (fixnum oldpos))
-		(if (char= repl-char (schar string oldpos))
-		    (dotimes (repl-pos repl-length)
-		      (declare (fixnum repl-pos))
-		      (setf (schar new-string newpos) (schar repl-str repl-pos))
-		      (incf newpos))
-		    (progn
-		      (setf (schar new-string newpos) (schar string oldpos))
-		      (incf newpos)))))
-	    new-string)))))
-
-    
+  (substitute-chars-strings 
+   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;") (#\" . "&quot;"))))
+
 
 (defun make-usb8-array (len)
   (make-array len :adjustable nil
@@ -244,3 +232,62 @@ list of characters and replacement strings."
       (setf (aref vec i) (char-code (schar str i))))
     vec))
 
+(defun concat-separated-strings (separator &rest lists)
+  (format nil (format nil "~~{~~A~~^~A~~}" separator) (append-sublists lists)))
+
+(defun only-null-list-elements-p (lst)
+  (or (null lst) (every #'null lst)))
+
+(defun print-separated-strings (strm separator &rest lists)
+  (declare (optimize (speed 3) (safety 0) (space 0) (debug 0)
+		     (compilation-speed 0)))
+  (do* ((rest-lists lists (cdr rest-lists))
+	(list (car rest-lists) (car rest-lists))
+	(last-list (only-null-list-elements-p (cdr rest-lists))
+		   (only-null-list-elements-p (cdr rest-lists))))
+       ((null rest-lists) strm)
+    (do* ((lst list (cdr lst))
+	  (elem (car lst) (car lst))
+	  (last-elem (null (cdr lst)) (null (cdr lst))))
+	 ((null lst))
+      (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)))))