X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fprint.lisp;h=4981c77f2e0a32f9b8354b5fb5531509e9b7e04b;hb=b420873de742dd0e9ff0d2231d2cc37cf6aba3f8;hp=48889e50f77b0bd3f38299cef626646feddc5ba8;hpb=c5df202d52732a0dea8dc3558954a729073b7970;p=sbcl.git

diff --git a/src/code/print.lisp b/src/code/print.lisp
index 48889e5..4981c77 100644
--- a/src/code/print.lisp
+++ b/src/code/print.lisp
@@ -597,11 +597,12 @@
 ;;; words, diddle its case according to *PRINT-CASE* and
 ;;; READTABLE-CASE.
 (defun output-symbol-name (name stream &optional (maybe-quote t))
-  (declare (type simple-base-string name))
-  (setup-printer-state)
-  (if (and maybe-quote (symbol-quotep name))
-      (output-quoted-symbol-name name stream)
-      (funcall *internal-symbol-output-fun* name stream)))
+  (declare (type simple-string name))
+  (let ((*readtable* (if *print-readably* *standard-readtable* *readtable*)))
+    (setup-printer-state)
+    (if (and maybe-quote (symbol-quotep name))
+	(output-quoted-symbol-name name stream)
+	(funcall *internal-symbol-output-fun* name stream))))
 
 ;;;; escaping symbols
 
@@ -875,19 +876,19 @@
 ;;; :DOWNCASE		:CAPITALIZE
 (defun output-capitalize-symbol (pname stream)
   (declare (simple-string pname))
-  (let ((prev-not-alpha t)
+  (let ((prev-not-alphanum t)
 	(up (eq (readtable-case *readtable*) :upcase)))
     (dotimes (i (length pname))
       (let ((char (char pname i)))
 	(write-char (if up
-			(if (or prev-not-alpha (lower-case-p char))
+			(if (or prev-not-alphanum (lower-case-p char))
 			    char
 			    (char-downcase char))
-			(if prev-not-alpha
+			(if prev-not-alphanum
 			    (char-upcase char)
 			    char))
 		    stream)
-	(setq prev-not-alpha (not (alpha-char-p char)))))))
+	(setq prev-not-alphanum (not (alphanumericp char)))))))
 
 ;;; called when:
 ;;; READTABLE-CASE	*PRINT-CASE*
@@ -976,7 +977,7 @@
 	   (write-char (if (zerop bit) #\0 #\1) stream)))
 	(t
 	 (when (and *print-readably*
-		    (not (array-readably-printable-p array)))
+		    (not (array-readably-printable-p vector)))
 	   (error 'print-not-readable :object vector))
 	 (descend-into (stream)
 		       (write-string "#(" stream)
@@ -1163,8 +1164,8 @@
       (2 (write-char #\b stream))
       (8 (write-char #\o stream))
       (16 (write-char #\x stream))
-      (t (write *print-base* :stream stream :radix nil :base 10)))
-    (write-char #\r stream))
+      (t (write *print-base* :stream stream :radix nil :base 10)
+	 (write-char #\r stream))))
   (let ((*print-radix* nil))
     (output-integer (numerator ratio) stream)
     (write-char #\/ stream)
@@ -1402,7 +1403,9 @@
       (declare (ignore sig))
       (if (= x 0.0e0)
 	  (values (float 0.0e0 original-x) 1)
-	  (let* ((ex (round (* exponent (log 2e0 10))))
+	  (let* ((ex (locally (declare (optimize (safety 0)))
+                       (the fixnum
+                         (round (* exponent (log 2e0 10))))))
 		 (x (if (minusp ex)
 			(if (float-denormalized-p x)
 			    #!-long-float
@@ -1419,7 +1422,9 @@
 		      (z y (* y m))
 		      (ex ex (1- ex)))
 		     ((>= z 0.1e0)
-		      (values (float z original-x) ex))))))))))
+		      (values (float z original-x) ex))
+                   (declare (long-float m) (integer ex))))
+              (declare (long-float d))))))))
 (eval-when (:compile-toplevel :execute)
   (setf *read-default-float-format* 'single-float))
 
@@ -1524,9 +1529,10 @@
 ;;; the character name or the character in the #\char format.
 (defun output-character (char stream)
   (if (or *print-escape* *print-readably*)
-      (let ((name (char-name char)))
+      (let ((graphicp (graphic-char-p char))
+	    (name (char-name char)))
 	(write-string "#\\" stream)
-	(if name
+	(if (and name (not graphicp))
 	    (quote-string name stream)
 	    (write-char char stream)))
       (write-char char stream)))