X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=strings.lisp;h=a9b3d0f9b320a95126b206348e852d812ea8a9b2;hp=9dbe1babdccd7950172033dc0d5c6d9614ff4921;hb=f03310d76a2458e5efb45b89f8e6b087db7f4ed1;hpb=e9927af19ebf762b2311f296643c00e3aa9cbb00 diff --git a/strings.lisp b/strings.lisp index 9dbe1ba..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)) @@ -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)