X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Flate-format.lisp;h=a0d204ebeedcd84a8567f1578109aabca3bc1570;hb=34e8e7fd14989e1c86e9408733b4a73c46dd0a92;hp=bc1cfe4ec7c5c1c35696eea639f1956ebe2d3f5b;hpb=4d50265fe5a3dd4ea5b35c8ec12fe2b88721d22c;p=sbcl.git diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp index bc1cfe4..a0d204e 100644 --- a/src/code/late-format.lisp +++ b/src/code/late-format.lisp @@ -222,6 +222,7 @@ (char-code (format-directive-character directive)))) (*default-format-error-offset* (1- (format-directive-end directive)))) + (declare (type (or null function) expander)) (if expander (funcall expander directive more-directives) (error 'format-error @@ -976,7 +977,7 @@ close params string end) (expand-format-logical-block prefix per-line-p insides suffix atsignp)) - (let ((count (apply #'+ (mapcar (lambda (x) (count-if #'illegal-inside-justification-p x)) segments)))) + (let ((count (reduce #'+ (mapcar (lambda (x) (count-if #'illegal-inside-justification-p x)) segments)))) (when (> count 0) ;; ANSI specifies that "an error is signalled" in this ;; situation.