X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=3ec10599c7f9623014002b964d73bacba4ad257a;hb=b6194ba1e9e25a4bf6fd13e82d917648edc2ff50;hp=41226cbc060399990f140619d9444dfc70a7a628;hpb=1bbb76fcfb9baddf0dc96412c87575d8aeb69c6d;p=sbcl.git

diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index 41226cb..3ec1059 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -316,7 +316,7 @@
 (defvar *ouch-ptr*)
 
 (declaim (type index *read-buffer-length* *inch-ptr* *ouch-ptr*))
-(declaim (simple-string *read-buffer*))
+(declaim (type (simple-array character (*)) *read-buffer*))
 
 (defmacro reset-read-buffer ()
   ;; Turn *READ-BUFFER* into an empty read buffer.
@@ -736,7 +736,8 @@
 	(colons 0)
 	(possibly-rational t)
 	(possibly-float t)
-	(escapes ()))
+	(escapes ())
+	(seen-multiple-escapes nil))
     (reset-read-buffer)
     (prog ((char firstchar))
       (case (char-class3 char attribute-table)
@@ -956,6 +957,7 @@
 	(#.+char-attr-package-delimiter+ (go COLON))
 	(t (go SYMBOL)))
       MULT-ESCAPE
+      (setq seen-multiple-escapes t)
       (do ((char (read-char stream t) (read-char stream t)))
 	  ((multiple-escape-p char))
 	(if (escapep char) (setq char (read-char stream t)))
@@ -983,7 +985,9 @@
 		;; a FIND-PACKAGE* function analogous to INTERN*
 		;; and friends?
 		(read-buffer-to-string)
-		*keyword-package*))
+		(if seen-multiple-escapes
+		    (read-buffer-to-string)
+		    *keyword-package*)))
       (reset-read-buffer)
       (setq escapes ())
       (setq char (read-char stream nil nil))
@@ -1220,22 +1224,19 @@
 		 ;; while attempting to constant-fold. Maybe some sort
 		 ;; of load-time-form magic could be used instead?
 		 (case float-format
-		   (short-float
-		    (values
-		     (log sb!xc:least-positive-normalized-short-float 10s0)
-		     (log sb!xc:most-positive-short-float 10s0)))
-		   (single-float
+		   ((short-float single-float)
 		    (values
 		     (log sb!xc:least-positive-normalized-single-float 10f0)
 		     (log sb!xc:most-positive-single-float 10f0)))
-		   (double-float
+		   ((double-float #!-long-float long-float)
 		    (values
 		     (log sb!xc:least-positive-normalized-double-float 10d0)
 		     (log sb!xc:most-positive-double-float 10d0)))
+		   #!+long-float
 		   (long-float
 		    (values
-		     (log sb!xc:least-positive-normalized-long-float 10L0)
-		     (log sb!xc:most-positive-long-float 10L0))))
+		     (log sb!xc:least-positive-normalized-long-float 10l0)
+		     (log sb!xc:most-positive-long-float 10l0))))
 	       (let ((correction (cond ((<= exponent min-expo)
 					(ceiling (- min-expo exponent)))
 				       ((>= exponent max-expo)
@@ -1430,7 +1431,7 @@
 	       `(error 'simple-parse-error
 		       :format-control ,format-control
 		       :format-arguments (list string))))
-    (with-array-data ((string string)
+    (with-array-data ((string string :offset-var offset)
 		      (start start)
 		      (end (%check-vector-sequence-bounds string start end)))
       (let ((index (do ((i start (1+ i)))
@@ -1459,10 +1460,10 @@
 			found-digit t))
 		 (junk-allowed (return nil))
 		 ((whitespacep char)
-		  (do ((jndex (1+ index) (1+ jndex)))
-		      ((= jndex end))
-		    (declare (fixnum jndex))
-		    (unless (whitespacep (char string jndex))
+                  (loop
+                   (incf index)
+                   (when (= index end) (return))
+                   (unless (whitespacep (char string index))
 		      (parse-error "junk in string ~S")))
 		  (return nil))
 		 (t
@@ -1474,7 +1475,7 @@
 	     (if junk-allowed
 		 nil
 		 (parse-error "no digits in string ~S")))
-	 index)))))
+	 (- index offset))))))
 
 ;;;; reader initialization code