From c02ffa180c9145aa95476fce1b26c7dfa656ea66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Mon, 11 May 2015 21:37:38 +0200 Subject: [PATCH] fromat-f: Use new wrapper function float-to-digits*. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Kochmański --- src/lsp/format.lsp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/lsp/format.lsp b/src/lsp/format.lsp index 710b463d5..f29914229 100644 --- a/src/lsp/format.lsp +++ b/src/lsp/format.lsp @@ -119,25 +119,24 @@ (let ((s (make-string (1+ fdigits) :initial-element #\0))) (setf (schar s 0) #\.) (values s (length s) t nil 0)))) - (multiple-value-bind (e string) + (multiple-value-bind (e string zero?) (cond (fdigits - (float-to-digits nil x - (min (- (+ fdigits scale)) - (- fmin)) - nil)) + (float-to-digits* nil x + (min (- (+ fdigits scale)) + (- fmin)) + nil)) ((null width) - (float-to-digits nil x nil nil)) + (float-to-digits* nil x nil nil)) (T (let ((w (multiple-value-list - (float-to-digits nil x - (max 1 - (+ (1- width) - (if (minusp scale) - scale 0))) - t))) + (float-to-digits* nil x + (+ (1- width) + (if (minusp scale) + scale 0)) + t))) (f (multiple-value-list - (float-to-digits nil x - (- (+ fmin scale)) - nil)))) + (float-to-digits* nil x + (- (+ fmin scale)) + nil)))) (if (>= (length (cadr w)) (length (cadr f))) (values-list w)