X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=fbb130caad55b5d4442653f43d1d57290354bd4a;hp=0c5ae7c4ec47407e0e77b358a1bf4c713dee89b2;hb=86a868a95313178cdc7a83d35856ccf5c2cf315f;hpb=1b7f506ec98bd5b885203a3250c52603b943cee9

diff --git a/strings.lisp b/strings.lisp
index 0c5ae7c..fbb130c 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))
 
-(defconst +char-code-lower-a+ (char-code #\a))
-(defconst +char-code-upper-a+ (char-code #\A))
-(defconst +char-code-0+ (char-code #\0))
+(defconstant* +char-code-lower-a+ (char-code #\a))
+(defconstant* +char-code-upper-a+ (char-code #\A))
+(defconstant* +char-code-0+ (char-code #\0))
 (declaim (type fixnum +char-code-0+ +char-code-upper-a+
 	       +char-code-0))
 
@@ -478,7 +481,7 @@ for characters in a string"
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar +unambiguous-charset+
     "abcdefghjkmnpqrstuvwxyz123456789ABCDEFGHJKLMNPQSRTUVWXYZ")
-  (defconstant +unambiguous-length+ (length +unambiguous-charset+)))
+  (defconstant* +unambiguous-length+ (length +unambiguous-charset+)))
 
 (defun random-char (&optional (set :lower-alpha))
   (ecase set