X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=0f2df53d9cbda222347c1d59817fd7b806cf87ea;hb=80f222325e1f677e5cf8de01c6990906fa47f65d;hp=7fc9cd1b832b9d7b3c71cd427a5fdc596ee524f4;hpb=abecd31762c38b078077ebbfbadb51139dee6059;p=sbcl.git

diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index 7fc9cd1..0f2df53 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -276,6 +276,7 @@
   (let ((*readtable* *standard-readtable*))
 
     (flet ((whitespaceify (char)
+	     (set-cmt-entry char nil)
 	     (set-cat-entry char +char-attr-whitespace+)))
       (whitespaceify (code-char tab-char-code))
       (whitespaceify #\linefeed)
@@ -284,7 +285,7 @@
       (whitespaceify (code-char return-char-code)))
 
     (set-cat-entry #\\ +char-attr-escape+)
-    (set-cmt-entry #\\ #'read-token)
+    (set-cmt-entry #\\ nil)
 
     ;; Easy macro-character definitions are in this source file.
     (set-macro-character #\" #'read-string)
@@ -301,8 +302,8 @@
 	((= ichar #O200))
       (setq char (code-char ichar))
       (when (constituentp char *standard-readtable*)
-	    (set-cat-entry char (get-secondary-attribute char))
-	    (set-cmt-entry char nil)))))
+	(set-cat-entry char (get-secondary-attribute char))
+	(set-cmt-entry char nil)))))
 
 ;;;; implementation of the read buffer
 
@@ -1272,46 +1273,10 @@
 				  (#\F 'single-float)
 				  (#\D 'double-float)
 				  (#\L 'long-float)))
-		  num)
-	     ;; Raymond Toy writes: We need to watch out if the
-	     ;; exponent is too small or too large. We add enough to
-	     ;; EXPONENT to make it within range and scale NUMBER
-	     ;; appropriately. This should avoid any unnecessary
-	     ;; underflow or overflow problems.
-	     (multiple-value-bind (min-expo max-expo)
-		 ;; FIXME: These forms are broken w.r.t.
-		 ;; cross-compilation portability, as the
-		 ;; cross-compiler will call the host's LOG function
-		 ;; while attempting to constant-fold. Maybe some sort
-		 ;; of load-time-form magic could be used instead?
-		 (case float-format
-		   ((short-float single-float)
-		    (values
-		     (log sb!xc:least-positive-normalized-single-float 10f0)
-		     (log sb!xc:most-positive-single-float 10f0)))
-		   ((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))))
-	       (let ((correction (cond ((<= exponent min-expo)
-					(ceiling (- min-expo exponent)))
-				       ((>= exponent max-expo)
-					(floor (- max-expo exponent)))
-				       (t
-					0))))
-		 (incf exponent correction)
-		 (setf number (/ number (expt 10 correction)))
-		 (setq num (make-float-aux number divisor float-format stream))
-		 (setq num (* num (expt 10 exponent)))
-		 (return-from make-float (if negative-fraction
-					     (- num)
-					     num))))))
-	  ;; should never happen
+		  (result (make-float-aux (* (expt 10 exponent) number)
+					  divisor float-format stream)))
+	     (return-from make-float
+	       (if negative-fraction (- result) result))))
 	  (t (bug "bad fallthrough in floating point reader")))))
 
 (defun make-float-aux (number divisor float-format stream)