From e4801d4c351cba5ef5c44daa37e28d4657a86803 Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Tue, 12 Jun 1990 02:26:11 +0000 Subject: [PATCH] Fixed ~A and ~S lossage were it assumed that nil got printed as "NIL" irrespective of *print-case*. --- code/format.lisp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/format.lisp b/code/format.lisp index a3d1adfbc..31fcc893e 100644 --- a/code/format.lisp +++ b/code/format.lisp @@ -913,12 +913,12 @@ (defun format-princ (colon atsign parms) (let ((arg (pop-format-arg))) (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 ((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) - (if colon "()" "NIL")) + "()") mincol colinc minpad padchar atsign))))) @@ -928,12 +928,12 @@ (defun format-prin1 (colon atsign parms) (let ((arg (pop-format-arg))) (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 ((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) - (if colon "()" "NIL")) + "()") mincol colinc minpad padchar atsign))))) -- GitLab