paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-06 11:50:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* improve precision of values specified with a decimal point and an exponent

Browse Source 
(based on report/hints by Dariusz Mazur)

git-svn-id: trunk@14533 -
This commit is contained in:
Jonas Maebe 2010-01-03 15:56:06 +00:00
parent 31e2f16484
commit 6399bcd4e3
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -8247,6 +8247,7 @@ tests/tbs/tb0561a.pp svneol=native#text/plain
tests/tbs/tb0561b.pp svneol=native#text/plain
tests/tbs/tb0564.pp svneol=native#text/plain
tests/tbs/tb0565.pp svneol=native#text/plain
tests/tbs/tb0566.pp svneol=native#text/plain
tests/tbs/tb205.pp svneol=native#text/plain
tests/tbs/ub0060.pp svneol=native#text/plain
tests/tbs/ub0069.pp svneol=native#text/plain

22
rtl/inc/sstrings.inc
View File

@ -1072,12 +1072,14 @@ Function fpc_Val_Real_ShortStr(const s : shortstring; out Code : ValSInt): ValRe
var
hd,
esign,sign : valreal;
exponent,i : SizeInt;
exponent,
decpoint,i : SizeInt;
flags : byte;
begin
fpc_Val_Real_ShortStr:=0.0;
code:=1;
exponent:=0;
decpoint:=0;
esign:=1;
flags:=0;
sign:=1;
@ -1101,17 +1103,15 @@ begin
{ Decimal ? }
if (length(s)>=code) and (s[code]='.') then
begin
hd:=1.0;
inc(code);
while (length(s)>=code) and (s[code] in ['0'..'9']) do
begin
{ Read fractional part. }
flags:=flags or 2;
fpc_Val_Real_ShortStr:=fpc_Val_Real_ShortStr*10+(ord(s[code])-ord('0'));
hd:=hd*10.0;
inc(decpoint);
inc(code);
end;
fpc_Val_Real_ShortStr:=fpc_Val_Real_ShortStr/hd;
end;
{ Again, read integer and fractional part}
if flags=0 then
@ -1120,7 +1120,7 @@ begin
exit;
end;
{ Exponent ? }
if (length(s)>=code) and (upcase(s[code])='E') then
if (length(s)>=code) and (s[code] in ['e','E']) then
begin
inc(code);
if Length(s) >= code then
@ -1144,6 +1144,18 @@ begin
inc(code);
end;
end;
{ adjust exponent based on decimal point }
if esign>0 then
begin
dec(exponent,decpoint);
if (exponent<0) then
begin
esign:=-1;
exponent:=-exponent;
end
end
else
inc(exponent,decpoint);
{ evaluate sign }
{ (before exponent, because the exponent may turn it into a denormal) }
fpc_Val_Real_ShortStr:=fpc_Val_Real_ShortStr*sign;

9
tests/tbs/tb0566.pp Normal file
View File

@ -0,0 +1,9 @@
var
d1,d2,d3 : extended;
err: longint;
begin
d1:=105;
d2:=1.05e2;
if (d1<>d2) then
halt(1);
end.