X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-extensions.lisp;h=259f3d7ed4e264a00cdf5a68b06050f380e0b3a6;hb=4603ca100a7d181fe4316429365fc725501336dd;hp=625c514c515f4a773a24fb5d96a39548a54e0291;hpb=75b52379bdc2269961af6a1308eca63610f38ac3;p=sbcl.git

diff --git a/src/code/target-extensions.lisp b/src/code/target-extensions.lisp
index 625c514..259f3d7 100644
--- a/src/code/target-extensions.lisp
+++ b/src/code/target-extensions.lisp
@@ -34,15 +34,33 @@ reserved for user and applications.")
 order when a saved core image starts up, after the system itself has
 been initialized. Unused by SBCL itself: reserved for user and
 applications.")
+
+
+;;; Binary search for simple vectors
+(defun binary-search (value seq &key (key #'identity))
+  (declare (simple-vector seq))
+  (labels ((recurse (start end)
+             (when (< start end)
+               (let* ((i (+ start (truncate (- end start) 2)))
+                      (elt (svref seq i))
+                      (key-value (funcall key elt)))
+                 (cond ((< value key-value)
+                        (recurse start i))
+                       ((> value key-value)
+                        (recurse (1+ i) end))
+                       (t
+                        elt))))))
+    (recurse 0 (length seq))))
+
 
 ;;; like LISTEN, but any whitespace in the input stream will be flushed
 (defun listen-skip-whitespace (&optional (stream *standard-input*))
   (do ((char (read-char-no-hang stream nil nil nil)
-	     (read-char-no-hang stream nil nil nil)))
+             (read-char-no-hang stream nil nil nil)))
       ((null char) nil)
-    (cond ((not (whitespacep char))
-	   (unread-char char stream)
-	   (return t)))))
+    (cond ((not (whitespace[1]p char))
+           (unread-char char stream)
+           (return t)))))
 
 ;;;; helpers for C library calls
 
@@ -50,15 +68,47 @@ applications.")
 ;;; errno problem, arranging for the condition's print representation
 ;;; to be similar to the ANSI C perror(3) style.
 (defun simple-perror (prefix-string
-		      &key
-		      (errno (get-errno))
-		      (simple-error 'simple-error)
-		      other-condition-args)
+                      &key
+                      (errno (get-errno))
+                      (simple-error 'simple-error)
+                      other-condition-args)
   (declare (type symbol simple-error))
   (aver (subtypep simple-error 'simple-condition))
   (aver (subtypep simple-error 'error))
   (apply #'error
-	 simple-error
-	 :format-control "~@<~A: ~2I~_~A~:>"
-	 :format-arguments (list prefix-string (strerror errno))
-	 other-condition-args))
+         simple-error
+         :format-control "~@<~A: ~2I~_~A~:>"
+         :format-arguments (list prefix-string (strerror errno))
+         other-condition-args))
+
+;;; Constructing shortish strings one character at a time. More efficient then
+;;; a string-stream, as can directly use simple-base-strings when applicable,
+;;; and if the maximum size is know doesn't need to copy the result at all --
+;;; but if the result is going to be HUGE, string-streams will win.
+(defmacro with-push-char ((&key (element-type 'character) (initial-size 28)) &body body)
+  (with-unique-names (string size pointer)
+    `(let* ((,size ,initial-size)
+            (,string (make-array ,size :element-type ',element-type))
+            (,pointer 0))
+       (declare (type (integer 0 ,sb!xc:array-dimension-limit) ,size)
+                (type (integer 0 ,(1- sb!xc:array-dimension-limit)) ,pointer)
+                (type (simple-array ,element-type (*)) ,string))
+       (flet ((push-char (char)
+                (declare (optimize (sb!c::insert-array-bounds-checks 0)))
+                (when (= ,pointer ,size)
+                  (let ((old ,string))
+                    (setf ,size (* 2 (+ ,size 2))
+                          ,string (make-array ,size :element-type ',element-type))
+                    (replace ,string old)))
+                (setf (char ,string ,pointer) char)
+                (incf ,pointer))
+              (get-pushed-string ()
+                (let ((string ,string)
+                      (size ,pointer))
+                  (setf ,size 0
+                        ,pointer 0
+                        ,string ,(coerce "" `(simple-array ,element-type (*))))
+                  ;; This is really local, so we can be destructive!
+                  (%shrink-vector string size)
+                  string)))
+         ,@body))))