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

format-e: adjust scale factor. Closes #39.

Browse source 
Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
This commit is contained in:
Daniel Kochmański 2015-05-12 15:03:06 +02:00
parent 586405328e
commit afc46ed981
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lsp/format.lsp
View file

@ -223,7 +223,7 @@
(setf x (* x 1.0l18) delta -18)
#-long-float
(setf x (* x 1.0l16) delta -16))
;; We find the appropriate factor that keeps the output within (0.1,1]
;; We find the appropriate factor that keeps the output within [0.1,1)
;; Note that we have to compute the exponential _every_ _time_ in the loop
;; because multiplying just by 10.0l0 every time would lead to a greater
;; loss of precission.
@ -232,12 +232,12 @@
(if (minusp ex)
(loop for y of-type long-float
= (* x (the long-float (expt 10.0l0 (- ex))))
while (<= y 0.1l0)
while (< y 0.1l0)
do (decf ex)
finally (return (values y (the fixnum (+ delta ex)))))
(loop for y of-type long-float
= (/ x (the long-float (expt 10.0l0 ex)))
while (> y 1.0l0)
while (>= y 1.0l0)
do (incf ex)
finally (return (values y (the fixnum (+ delta ex)))))))
#+(or)
@ -1471,9 +1471,8 @@
(prin1 number stream)
(multiple-value-bind (num expt)
(sys::scale-exponent (abs number))
(when (< expt 0)
(when (< expt 0) ; adjust scale factor
(decf k))
;; (incf expt))
(let* ((expt (- expt k))
(estr (decimal-string (abs expt)))
(elen (if e (max (length estr) e) (length estr)))