mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-15 13:52:16 -08:00
Code Issues Projects Releases Packages Wiki Activity

format: flonum-to-string: rework nested IF statements as cond.

Browse source 
Simplifies code. Also creates additional clause (commented now) to
handle special case, when width is too small to display number.

Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
This commit is contained in:
Daniel Kochmański 2015-05-10 15:14:49 +02:00
parent 3efcb4ed78
commit 5cbb3b905a
1 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/lsp/format.lsp
View file

@ -106,28 +106,35 @@
(values "." 1 t t 0)))
(t
(multiple-value-bind (e string)
(if fdigits
(float-to-digits nil x
(min (- (+ fdigits scale))
(- fmin))
nil)
(if (and width (> width 1))
(let ((w (multiple-value-list
(float-to-digits nil x
(max 1
(+ (1- width)
(if (minusp scale)
scale 0)))
t)))
(f (multiple-value-list
(float-to-digits nil x
(- (+ fmin scale))
nil))))
(cond
((>= (length (cadr w)) (length (cadr f)))
(values-list w))
(t (values-list f))))
(float-to-digits nil x nil nil)))
(cond
((not (null fdigits))
(float-to-digits nil x
(min (- (+ fdigits scale))
(- fmin))
nil))
((null width)
(float-to-digits nil x nil nil))
;; ((= width 1)
;; ;; This is a corner case. CLHS indicates, that minimal
;; ;; number of characters required to print a value
;; ;; should be used.
;; (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)))
(f (multiple-value-list
(float-to-digits nil x
(- (+ fmin scale))
nil))))
(format t "width is ~A, w is ~A~&" width w)
(if (>= (length (cadr w))
(length (cadr f)))
(values-list w)
(values-list f)))))
(let ((e (+ e scale))
(stream (make-string-output-stream)))
(if (plusp e)