Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct floating decimal point scaling of fractions in sfio library #131

Merged
merged 6 commits into from
Sep 14, 2020
Merged

Correct floating decimal point scaling of fractions in sfio library #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57316be
Correct floating decimal point scaling of fractions in floating point…
hyenias Sep 13, 2020
69d658d
Merge branch 'master' into float-scaling
hyenias Sep 13, 2020
15f0d0c
move regress tests to math.sh; use AT&T indentation style
McDutchie Sep 14, 2020
52984fc
sfcvt.c: fix whitespace formatting
McDutchie Sep 14, 2020
f2b8b4e
sfcvt.c: minor whitespace tweaks for consistency with rest of code
McDutchie Sep 14, 2020
346d0d7
tests/math.sh: fix minor formating inconsistency I introduced myself
McDutchie Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/cmd/ksh93/tests/math.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,48 @@ function test_has_iszero
test_arithmetric_expression_accesss_array_element_through_nameref
test_has_iszero

# ======
# Validate that typeset -E/F formatting matches that of their equivalent
# printf formatting options as well as checking for correct float scaling
# of the fractional parts.

unset i tf pf; typeset -F 3 tf
for i in {'','-'}{0..1}.{0,9}{0,9}{0,1,9}{0,1,9}
do tf=$i
pf=${ printf '%.3f' tf ;}
if [[ $tf != "$pf" ]]
then err_exit "typeset -F formatted data does not match its printf. typeset -F 3: $tf != $pf"
break
fi
done
unset i tf pf; typeset -lF 3 tf
for i in {'','-'}{0..1}.{0,9}{0,9}{0,1,9}{0,1,9}
do tf=$i
pf=${ printf '%.3Lf' tf ;}
if [[ $tf != "$pf" ]]
then err_exit "typeset -lF formatted data does not match its printf. typeset -lF 3: $tf != $pf"
break
fi
done
unset i tf pf; typeset -E 3 tf
for i in {'','-'}{0..1}.{0,9}{0,9}{0,1,9}{0,1,9}
do tf=$i
pf=${ printf '%.3g' tf ;}
if [[ $tf != "$pf" ]]
then err_exit "typeset -E formatted data does not match its printf. typeset -E 3: $tf != $pf"
break
fi
done
unset i tf pf; typeset -lE 3 tf
for i in {'','-'}{0..1}.{0,9}{0,9}{0,1,9}{0,1,9}
do tf=$i
pf=${ printf '%.3Lg' tf ;}
if [[ $tf != "$pf" ]]
then err_exit "typeset -lE formatted data does not match its printf. typeset -lE 3: $tf != $pf"
break
fi
done
unset i tf pf

# ======
exit $((Errors<125?Errors:125))
25 changes: 17 additions & 8 deletions src/lib/libast/sfio/sfcvt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ int format; /* conversion format */

while(sp < ep)
{ /* generate fractional digits */
if(f <= 0.)
if(f <= 0. && *decpt >= 0)
{ /* fill with 0's */
do { *sp++ = '0'; } while(sp < ep);
goto done;
Expand Down Expand Up @@ -404,7 +404,7 @@ int format; /* conversion format */
}
} while(f >= (double)CVT_DBL_MAXINT);
}
else if(f > 0.0 && f < 1e-8)
else if(f > 0.0 && f < 0.1)
{ /* scale to avoid excessive multiply by 10 below */
v = SF_MAXEXP10-1;
do
Expand Down Expand Up @@ -459,7 +459,7 @@ int format; /* conversion format */

while(sp < ep)
{ /* generate fractional digits */
if(f <= 0.)
if(f <= 0. && *decpt >= 0)
{ /* fill with 0's */
do { *sp++ = '0'; } while(sp < ep);
goto done;
Expand All @@ -480,20 +480,29 @@ int format; /* conversion format */
ep = b+1;
else if(ep < endsp)
{ /* round the last digit */
*--sp += 5;
if (!(format&SFFMT_EFORMAT) && *decpt < 0)
sp += *decpt-1;
else
--sp;
*sp += 5;
while(*sp > '9')
{ *sp = '0';
if(sp > b)
{ if(sp > b)
{ *sp = '0';
*--sp += 1;
}
else
{ /* next power of 10 */
{ /* next power of 10 and at beginning */
*sp = '1';
*decpt += 1;
if(!(format&SFFMT_EFORMAT))
{ /* add one more 0 for %f precision */
ep[-1] = '0';
if (sp != &ep[-1])
{ /* prevents overwriting the previous 1 with 0 */
ep[-1] = '0';
}
ep += 1;
}
break;
}
}
}
Expand Down