projects
/
jscl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #117 from Ferada/small-fixes
[jscl.git]
/
src
/
print.lisp
diff --git
a/src/print.lisp
b/src/print.lisp
index
ed7b8c1
..
42ceba4
100644
(file)
--- a/
src/print.lisp
+++ b/
src/print.lisp
@@
-199,7
+199,7
@@
(#\space "space")
(otherwise (string form)))))
((stringp form) (if *print-escape*
(#\space "space")
(otherwise (string form)))))
((stringp form) (if *print-escape*
- (concat "\"" (escape-string form) "\"")
+ (lisp-escape-string form)
form))
((functionp form)
(let ((name (oget form "fname")))
form))
((functionp form)
(let ((name (oget form "fname")))
@@
-267,10
+267,12
@@
(concatf res "~"))
((char= next #\%)
(concatf res *newline*))
(concatf res "~"))
((char= next #\%)
(concatf res *newline*))
+ ((char= next #\*)
+ (pop arguments))
(t
(concatf res (format-special next (car arguments)))
(pop arguments))))
(t
(concatf res (format-special next (car arguments)))
(pop arguments))))
- (setq res (concat res (char-to-string c))))
+ (setq res (concat res (string c))))
(incf i)))
(if destination
(progn
(incf i)))
(if destination
(progn
@@
-279,6
+281,6
@@
res)))
(defun format-special (chr arg)
res)))
(defun format-special (chr arg)
- (case chr
+ (case (char-upcase chr)
(#\S (prin1-to-string arg))
(#\S (prin1-to-string arg))
- (#\a (princ-to-string arg))))
+ (#\A (princ-to-string arg))))