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

* Merging revisions 46778 from trunk:

Browse Source 
------------------------------------------------------------------------
    r46778 | jonas | 2020-09-05 20:44:57 +0200 (Sat, 05 Sep 2020) | 2 lines
    
      * fix formatfloat for 0 in exponential format (based on patch by
        Jamie Philbrook, mantis #37374)
    ------------------------------------------------------------------------

git-svn-id: tags/release_3_2_0@47409 -
This commit is contained in:
michael 2020-11-13 20:41:07 +00:00
parent 792ea2b250
commit f42f55aed8
3 changed files with 204 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -15445,6 +15445,7 @@ tests/test/units/sysutils/tstrcmp.pp svneol=native#text/plain
tests/test/units/sysutils/tstrtobool.pp svneol=native#text/plain
tests/test/units/sysutils/tunifile.pp svneol=native#text/plain
tests/test/units/sysutils/tuplow.pp svneol=native#text/plain
tests/test/units/sysutils/tw37374.pp svneol=native#text/plain
tests/test/units/sysutils/twstralloc.pp svneol=native#text/plain
tests/test/units/sysutils/twstrcmp.pp svneol=native#text/plain
tests/test/units/ucomplex/tcsqr1.pp svneol=native#text/pascal

13
rtl/objpas/sysutils/fmtflt.inc
View File

@ -298,11 +298,13 @@ var
Function FormatExponent(ASign: FChar; aExponent: Integer) : FString;
begin
Result:=IntToStr(aExponent);
if E = 0 then
aExponent := 0;
Result:=IntToStr(Abs(aExponent));
Result:=StringOfChar('0',ExpSize-Length(Result))+Result;
if (aExponent<0) then
Result:='-'+Result
else if (aExponent>0) and (aSign='+') then
else if (aExponent>=0) and (aSign='+') then
Result:=aSign+Result;
end;
@ -383,7 +385,12 @@ begin
Inc(I);
end;
end;
end;
end
else if I< SectionLength Then
begin
inc(I);
ToResult(Section[i]);
end;
end;
else
ToResult(C);

193
tests/test/units/sysutils/tw37374.pp Executable file
View File

@ -0,0 +1,193 @@
program formatfloat_test;
uses
SysUtils//, MyFormatFloat
;
var
fails: Integer = 0;
testCount: Integer = 0;
procedure Test(AFormat: String; AValue: Double; AResult: String);
var
s: String;
begin
s := FormatFloat(AFormat, AValue);
if s <> AResult then
begin
WriteLn('Format(' + AFormat + ', ', AValue:0:6, ') --> ', s, '; SHOULD BE: ', AResult);
inc(fails);
end;
inc(testCount);
end;
const
VALUES: array[0..4] of Double = (0, 0.00001234, 0.123456, 1.23456, 1123.4567);
var
fmt: String;
begin
DefaultFormatSettings.DecimalSeparator := '.';
DefaultFormatSettings.ThousandSeparator := ',';
fmt := '0.00';
Test(fmt, VALUES[0], '0.00');
Test(fmt, VALUES[1], '0.00');
Test(fmt, VALUES[2], '0.12');
Test(fmt, VALUES[3], '1.23');
Test(fmt, VALUES[4], '1123.46');
Test(fmt, -VALUES[1], '-0.00');
Test(fmt, -VALUES[2], '-0.12');
Test(fmt, -VALUES[3], '-1.23');
Test(fmt, -VALUES[4], '-1123.46');
fmt := '.00';
Test(fmt, VALUES[0], '.00');
Test(fmt, VALUES[1], '.00');
Test(fmt, VALUES[2], '.12');
Test(fmt, VALUES[3], '1.23');
Test(fmt, VALUES[4], '1123.46');
Test(fmt, -VALUES[1], '-.00');
Test(fmt, -VALUES[2], '-.12');
Test(fmt, -VALUES[3], '-1.23');
Test(fmt, -VALUES[4], '-1123.46');
fmt := '0.00000###';
Test(fmt, VALUES[0], '0.00000');
Test(fmt, VALUES[1], '0.00001234');
Test(fmt, VALUES[2], '0.123456');
Test(fmt, VALUES[3], '1.23456');
Test(fmt, VALUES[4], '1123.45670');
Test(fmt, -VALUES[1], '-0.00001234');
Test(fmt, -VALUES[2], '-0.123456');
Test(fmt, -VALUES[3], '-1.23456');
Test(fmt, -VALUES[4], '-1123.45670');
fmt := '000';
Test(fmt, VALUES[0], '000');
Test(fmt, VALUES[1], '000');
Test(fmt, VALUES[2], '000');
Test(fmt, VALUES[3], '001');
Test(fmt, VALUES[4], '1123');
Test(fmt, -VALUES[1], '-000');
Test(fmt, -VALUES[2], '-000');
Test(fmt, -VALUES[3], '-001');
Test(fmt, -VALUES[4], '-1123');
fmt := '0.00E+00';
Test(fmt, VALUES[0], '0.00E+00');
Test(fmt, VALUES[1], '1.23E-05');
Test(fmt, VALUES[2], '1.23E-01');
Test(fmt, VALUES[3], '1.23E+00');
Test(fmt, VALUES[4], '1.12E+03');
Test(fmt, -VALUES[1], '-1.23E-05');
Test(fmt, -VALUES[2], '-1.23E-01');
Test(fmt, -VALUES[3], '-1.23E+00');
Test(fmt, -VALUES[4], '-1.12E+03');
fmt := '0.00E-00';
Test(fmt, VALUES[0], '0.00E00');
Test(fmt, VALUES[1], '1.23E-05');
Test(fmt, VALUES[2], '1.23E-01');
Test(fmt, VALUES[3], '1.23E00');
Test(fmt, VALUES[4], '1.12E03');
Test(fmt, -VALUES[1], '-1.23E-05');
Test(fmt, -VALUES[2], '-1.23E-01');
Test(fmt, -VALUES[3], '-1.23E00');
Test(fmt, -VALUES[4], '-1.12E03');
fmt := '0.00 EUR';
Test(fmt, VALUES[0], '0.00 EUR');
Test(fmt, VALUES[1], '0.00 EUR');
Test(fmt, VALUES[2], '0.12 EUR');
Test(fmt, VALUES[3], '1.23 EUR');
Test(fmt, VALUES[4], '1123.46 EUR');
Test(fmt, -VALUES[1], '-0.00 EUR');
Test(fmt, -VALUES[2], '-0.12 EUR');
Test(fmt, -VALUES[3], '-1.23 EUR');
Test(fmt, -VALUES[4], '-1123.46 EUR');
fmt := '0.00 "EUR"';
Test(fmt, VALUES[0], '0.00 EUR');
Test(fmt, VALUES[1], '0.00 EUR');
Test(fmt, VALUES[2], '0.12 EUR');
Test(fmt, VALUES[3], '1.23 EUR');
Test(fmt, VALUES[4], '1123.46 EUR');
Test(fmt, -VALUES[1], '-0.00 EUR');
Test(fmt, -VALUES[2], '-0.12 EUR');
Test(fmt, -VALUES[3], '-1.23 EUR');
Test(fmt, -VALUES[4], '-1123.46 EUR');
fmt := '0.00"E+00"';
Test(fmt, VALUES[0], '0.00E+00');
Test(fmt, VALUES[1], '0.00E+00');
Test(fmt, VALUES[2], '0.12E+00');
Test(fmt, VALUES[3], '1.23E+00');
Test(fmt, VALUES[4], '1123.46E+00');
Test(fmt, -VALUES[1], '-0.00E+00');
Test(fmt, -VALUES[2], '-0.12E+00');
Test(fmt, -VALUES[3], '-1.23E+00');
Test(fmt, -VALUES[4], '-1123.46E+00');
fmt := '#,##0.0';
Test(fmt, VALUES[0], '0.0');
Test(fmt, VALUES[1], '0.0');
Test(fmt, VALUES[2], '0.1');
Test(fmt, VALUES[3], '1.2');
Test(fmt, VALUES[4], '1,123.5');
Test(fmt, -VALUES[1], '-0.0');
Test(fmt, -VALUES[2], '-0.1');
Test(fmt, -VALUES[3], '-1.2');
Test(fmt, -VALUES[4], '-1,123.5');
fmt := ',0.0';
Test(fmt, VALUES[0], '0.0');
Test(fmt, VALUES[1], '0.0');
Test(fmt, VALUES[2], '0.1');
Test(fmt, VALUES[3], '1.2');
Test(fmt, VALUES[4], '1,123.5');
Test(fmt, -VALUES[1], '-0.0');
Test(fmt, -VALUES[2], '-0.1');
Test(fmt, -VALUES[3], '-1.2');
Test(fmt, -VALUES[4], '-1,123.5');
fmt := '#,##0.00;(#,##0.00);zero';
Test(fmt, VALUES[0], 'zero');
Test(fmt, VALUES[1], '0.00');
Test(fmt, VALUES[2], '0.12');
Test(fmt, VALUES[3], '1.23');
Test(fmt, VALUES[4], '1,123.46');
Test(fmt, -VALUES[1], '(0.00)');
Test(fmt, -VALUES[2], '(0.12)');
Test(fmt, -VALUES[3], '(1.23)');
Test(fmt, -VALUES[4], '(1,123.46)');
fmt := '#,##0.00 EUR;(#,##0.00 EUR);zero';
Test(fmt, VALUES[0], 'zero');
Test(fmt, VALUES[1], '0.00 EUR');
Test(fmt, VALUES[2], '0.12 EUR');
Test(fmt, VALUES[3], '1.23 EUR');
Test(fmt, VALUES[4], '1,123.46 EUR');
Test(fmt, -VALUES[1], '(0.00 EUR)');
Test(fmt, -VALUES[2], '(0.12 EUR)');
Test(fmt, -VALUES[3], '(1.23 EUR)');
Test(fmt, -VALUES[4], '(1,123.46 EUR)');
fmt := 'EUR #,##0.00;(EUR #,##0.00);-';
Test(fmt, VALUES[0], '-');
Test(fmt, VALUES[1], 'EUR 0.00');
Test(fmt, VALUES[2], 'EUR 0.12');
Test(fmt, VALUES[3], 'EUR 1.23');
Test(fmt, VALUES[4], 'EUR 1,123.46');
Test(fmt, -VALUES[1], '(EUR 0.00)');
Test(fmt, -VALUES[2], '(EUR 0.12)');
Test(fmt, -VALUES[3], '(EUR 1.23)');
Test(fmt, -VALUES[4], '(EUR 1,123.46)');
WriteLn(testCount, ' tests executed.');
if fails = 0 then
WriteLn('All tests passed.')
else
halt(1);
end.