projects
/
jscl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FORMAT specifier X.
[jscl.git]
/
src
/
print.lisp
diff --git
a/src/print.lisp
b/src/print.lisp
index
db3be82
..
a540357
100644
(file)
--- a/
src/print.lisp
+++ b/
src/print.lisp
@@
-45,6
+45,7
@@
(when (or (terminalp ch)
(char= ch #\:)
(char= ch #\\)
(when (or (terminalp ch)
(char= ch #\:)
(char= ch #\\)
+ (not (char= ch (char-upcase ch)))
(char= ch #\|))
(return-from escape-symbol-name-p t))))
dots-only))
(char= ch #\|))
(return-from escape-symbol-name-p t))))
dots-only))
@@
-256,9
+257,13
@@
(let ((*print-escape* nil))
(write-to-string form)))
(let ((*print-escape* nil))
(write-to-string form)))
+(defun terpri ()
+ (write-char #\newline)
+ (values))
+
(defun write-line (x)
(write-string x)
(defun write-line (x)
(write-string x)
- (write-string *newline*)
+ (terpri)
x)
(defun warn (string)
x)
(defun warn (string)
@@
-282,15
+287,14
@@
((char= next #\~)
(concatf res "~"))
((char= next #\%)
((char= next #\~)
(concatf res "~"))
((char= next #\%)
- (concatf res *newline*))
+ (concatf res (string #\newline)))
((char= next #\*)
(pop arguments))
(t
(concatf res (format-special next (car arguments)))
(pop arguments))))
(setq res (concat res (string c))))
((char= next #\*)
(pop arguments))
(t
(concatf res (format-special next (car arguments)))
(pop arguments))))
(setq res (concat res (string c))))
- (incf i))
- (/debug res))
+ (incf i)))
(if destination
(progn
(write-string res)
(if destination
(progn
(write-string res)
@@
-300,4
+304,5
@@
(defun format-special (chr arg)
(case (char-upcase chr)
(#\S (prin1-to-string arg))
(defun format-special (chr arg)
(case (char-upcase chr)
(#\S (prin1-to-string arg))
- (#\A (princ-to-string arg))))
+ (#\A (princ-to-string arg))
+ (#\D (princ-to-string arg))))