X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=a9b3d0f9b320a95126b206348e852d812ea8a9b2;hp=533bf013a5c663fba805486f07927344f7f39afd;hb=36e2522dde1173c28300156cb718779d5858c36d;hpb=5f3fba52fd7c9984a7f797c4720ec93799d6d786

diff --git a/strings.lisp b/strings.lisp
index 533bf01..a9b3d0f 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -227,17 +227,20 @@ list of characters and replacement strings."
 (defun make-usb8-array (len)
   (make-array len :element-type '(unsigned-byte 8)))
 
-(defun usb8-array-to-string (vec)
-  (declare (type (simple-array (unsigned-byte 8) (*)) vec))
-  (let* ((len (length vec))
+(defun usb8-array-to-string (vec &key (start 0) end)
+  (declare (type (simple-array (unsigned-byte 8) (*)) vec)
+	   (fixnum start))
+  (unless end
+    (setq end (length vec)))
+  (let* ((len (- end start))
 	 (str (make-string len)))
     (declare (fixnum len)
 	     (simple-string str)
-	     (optimize (speed 3)))
+	     (optimize (speed 3) (safety 0)))
     (do ((i 0 (1+ i)))
 	((= i len) str)
       (declare (fixnum i))
-      (setf (schar str i) (code-char (aref vec i))))))
+      (setf (schar str i) (code-char (aref vec (the fixnum (+ i start))))))))
 
 (defun string-to-usb8-array (str)
   (declare (simple-string str))
@@ -413,9 +416,9 @@ for characters in a string"
   (declare (type (integer 0 15) n))
   (schar +hex-chars+ n))
 
-(defconstant +char-code-lower-a+ (char-code #\a))
-(defconstant +char-code-upper-a+ (char-code #\A))
-(defconstant +char-code-0+ (char-code #\0))
+(defconst +char-code-lower-a+ (char-code #\a))
+(defconst +char-code-upper-a+ (char-code #\A))
+(defconst +char-code-0+ (char-code #\0))
 (declaim (type fixnum +char-code-0+ +char-code-upper-a+
 	       +char-code-0))
 
@@ -627,7 +630,7 @@ for characters in a string"
 (defun trim-non-alphanumeric (word)
   "Strip non-alphanumeric characters from beginning and end of a word."
   (declare (simple-string word)
-	   (optimize (speed 3) (safety 0) (size 0)))
+	   (optimize (speed 3) (safety 0) (space 0)))
   (let* ((start 0)
 	 (len (length word))
 	 (end len))
@@ -648,7 +651,6 @@ for characters in a string"
       word)))
 
 	  
-
 (defun collapse-whitespace (s)
   "Convert multiple whitespace characters to a single space character."
   (declare (simple-string s)