mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-25 05:51:55 -08:00
Code Issues Projects Releases Packages Wiki Activity

format.lsp: fix format ~e with width argument

Browse source 
Fixes #632.
This commit is contained in:
Marius Gerbershagen 2022-09-18 16:33:00 +02:00
parent 763369ee84
commit 0506ce34a3
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lsp/format.lsp
View file

@ -127,19 +127,20 @@
nil))
((null width)
(float-to-digits* nil x nil nil))
(T (let ((w (multiple-value-list
(T (let (;; w: the width-1 leading non-zero digits
(w (multiple-value-list
(float-to-digits* nil x
(max 0
(+ (- width 2)
(if (minusp scale)
scale 0)))
(max 0 scale)))
t)))
;; f: the fmin+1 leading non-zero digits; this
;; is used if w is empty (not enough space)
(f (multiple-value-list
(float-to-digits* nil x
(- (+ fmin scale))
nil))))
(if (>= (length (cadr w))
(length (cadr f)))
(if (>= (first f) (first w))
(values-list w)
(values-list f)))))
(let* ((exp (+ e scale))