Skip to content
Snippets Groups Projects
Commit e4801d4c authored by wlott's avatar wlott
Browse files

Fixed ~A and ~S lossage were it assumed that nil got printed as "NIL"

irrespective of *print-case*.
parent cba39348
No related branches found
No related tags found
No related merge requests found
...@@ -913,12 +913,12 @@ ...@@ -913,12 +913,12 @@
(defun format-princ (colon atsign parms) (defun format-princ (colon atsign parms)
(let ((arg (pop-format-arg))) (let ((arg (pop-format-arg)))
(if (null parms) (if (null parms)
(if arg (princ arg) (write-string (if colon "()" "NIL"))) (if (or arg (not colon)) (princ arg) (write-string "()"))
(with-format-parameters parms (with-format-parameters parms
((mincol 0) (colinc 1) (minpad 0) (padchar #\space)) ((mincol 0) (colinc 1) (minpad 0) (padchar #\space))
(format-write-field (if arg (format-write-field (if (or arg (not colon))
(princ-to-string arg) (princ-to-string arg)
(if colon "()" "NIL")) "()")
mincol colinc minpad padchar atsign))))) mincol colinc minpad padchar atsign)))))
...@@ -928,12 +928,12 @@ ...@@ -928,12 +928,12 @@
(defun format-prin1 (colon atsign parms) (defun format-prin1 (colon atsign parms)
(let ((arg (pop-format-arg))) (let ((arg (pop-format-arg)))
(if (null parms) (if (null parms)
(if arg (prin1 arg) (write-string (if colon "()" "NIL"))) (if (or arg (not colon)) (prin1 arg) (write-string "()"))
(with-format-parameters parms (with-format-parameters parms
((mincol 0) (colinc 1) (minpad 0) (padchar #\space)) ((mincol 0) (colinc 1) (minpad 0) (padchar #\space))
(format-write-field (if arg (format-write-field (if (or arg (not colon))
(prin1-to-string arg) (prin1-to-string arg)
(if colon "()" "NIL")) "()")
mincol colinc minpad padchar atsign))))) mincol colinc minpad padchar atsign)))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment