X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=975f1e2dcaad34dd1ff7b98d12ab1975a15cbdd8;hp=35a177e9715371cc38eea292eddb09c05d380518;hb=865f2486d2bb5ff217f640e0475b8646b9480bbe;hpb=8e31d13cfde9a2f7b6ea76a342a813e30dfe9696

diff --git a/strings.lisp b/strings.lisp
index 35a177e..975f1e2 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.7 2003/02/07 14:21:55 kevin Exp $
+;;;; $Id: strings.lisp,v 1.14 2003/04/29 00:49:09 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
 
@@ -90,12 +89,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 +108,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 +136,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,57 +148,51 @@
   (when (stringp str)
     (null (find-if #'not-whitespace? str))))
 
-#+ignore
-(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 orign-len))
+	 (new-len orig-len))
     (declare (fixnum orig-len new-len))
-    (dotimes (i orign-len)
+    (dotimes (i orig-len)
       (declare (fixnum i))
-      (let ((c (schar i str)))
-	)))
-  str)
+      (let* ((c (char str i))
+	     (match (assoc c repl-alist :test #'char=)))
+	(declare (character c))
+	(when match
+	  (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 #\& "&")
-   #\< "&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;"))))
+
 
 (defun make-usb8-array (len)
   (make-array len :adjustable nil