OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR libfortran/59771 (Cleanup handling of Gw.0 and Gw.0Ee format) 

2014-02-15  Jerry DeLisle  <jvdelisle@gcc.gnu>
	    Dominique d'Humieres  <dominiq@lps.ens.fr>

	Backport from mainline
	PR libfortran/59771
	PR libfortran/59774
	PR libfortran/59836
	* gfortran.dg/fmt_g_1.f90: New test.
	* gfortran.dg/round_3.f08: New cases added.

Co-Authored-By: Dominique d'Humieres <dominiq@lps.ens.fr>

From-SVN: r207804
This commit is contained in:
Jerry DeLisle 2014-02-15 16:55:19 +00:00
parent 50a0547289
commit 587d988ba6
3 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
2014-02-15 Jerry DeLisle <jvdelisle@gcc.gnu>
Dominique d'Humieres <dominiq@lps.ens.fr>
Backport from mainline
PR libfortran/59771
PR libfortran/59774
PR libfortran/59836
* gfortran.dg/fmt_g_1.f90: New test.
* gfortran.dg/round_3.f08: New cases added.
2014-02-08 Mikael Morin <mikael@gcc.gnu.org>
PR fortran/57033

11
gcc/testsuite/gfortran.dg/fmt_g_1.f90 Normal file
View File

@ -0,0 +1,11 @@
! { dg-do run }
! PR59771 Cleanup handling of Gw.0 and Gw.0Ee format
! Test case prepared by Dominique d'Humieres <dominiq@lps.ens.fr>
PROGRAM FOO
character(len=60) :: buffer, buffer1
write (buffer ,'(6(1X,1PG9.0e2))') 0.0, 0.04, 0.06, 0.4, 0.6, 243.0
write (buffer1,'(6(1X,1PE9.0e2))') 0.0, 0.04, 0.06, 0.4, 0.6, 243.0
if (buffer /= buffer1) call abort
end

41
gcc/testsuite/gfortran.dg/round_3.f08
View File

@ -16,19 +16,44 @@ program pr48615
call checkfmt("(RU,1P,G6.0E2)", 2.0, "2.E+00")
call checkfmt("(RU,1P,G10.4E2)", 2.3456e5, "2.3456E+05")
call checkfmt("(RU,F2.0)", 0.09, "1.") ! 0.
call checkfmt("(RC,G10.2)", 99.5, " 0.10E+03") ! pr59774
call checkfmt("(RC,G10.2)", 995., " 0.10E+04") ! pr59774
call checkfmt("(RC,G10.3)", 999.5, " 0.100E+04") ! pr59774
call checkfmt("(RC,G10.3)", 9995., " 0.100E+05") ! pr59774
call checkfmt("(RU,G10.2)", .099, " 0.10 ") ! pr59774
call checkfmt("(RC,G10.1)", .095, " 0.1 ") ! pr59774
call checkfmt("(RU,G10.3)", .0999, " 0.100 ") ! pr59774
call checkfmt("(RC,G10.2)", .0995, " 0.10 ") ! pr59774
call checkfmt("(RU,G9.3)", 891.1, " 892.") ! pr59836
call checkfmt("(RD,G9.3)", -891.1, "-892.") ! pr59836
call checkfmt("(RU,F6.4)", 0.00006, "0.0001")! 0.
call checkfmt("(RU,F5.3)", 0.0007, "0.001") ! 0.
call checkfmt("(RU,F4.2)", 0.008, "0.01") ! 0.
call checkfmt("(RU,F3.1)", 0.09, "0.1") ! 0.
call checkfmt("(RU,F2.0)", 0.09, "1.") ! 0.
call checkfmt("(RD,F3.0)", -0.09, "-1.") ! -0.
call checkfmt("(RU,F2.0)", 2.0, "2.") ! 3.
call checkfmt("(RD,F3.0)", -2.0, "-2.") ! -3.
call checkfmt("(RU,F6.4)", 2.0, "2.0000") ! 2.0001
call checkfmt("(RD,F7.4)", -2.0, "-2.0000") ! -2.0001
call checkfmt("(RU,1P,E6.0E2)", 2.0, "2.E+00") ! 3.E+00
call checkfmt("(RU,F2.0)", 0.9, "1.") ! pr59836
call checkfmt("(RC,F2.0)", 0.4, "0.") ! pr59836
call checkfmt("(RC,F2.0)", 0.5, "1.") ! pr59836
call checkfmt("(RC,F2.0)", 0.6, "1.") ! pr59836
call checkfmt("(RD,F3.0)", -0.9, "-1.") ! pr59836
call checkfmt("(RC,F3.0)", -0.4, "-0.") ! pr59836
call checkfmt("(RC,F3.0)", -0.5, "-1.") ! pr59836
call checkfmt("(RC,F3.0)", -0.6, "-1.") ! pr59836
call checkfmt("(RU,F2.0)", 2.0, "2.") ! 3.
call checkfmt("(RD,F3.0)", -2.0, "-2.") ! -3.
call checkfmt("(RU,F6.4)", 2.0, "2.0000") ! 2.0001
call checkfmt("(RD,F7.4)", -2.0, "-2.0000") ! -2.0001
call checkfmt("(RU,1P,E6.0E2)", 2.0, "2.E+00") ! 3.E+00
call checkfmt("(RD,1P,E7.0E2)", -2.0, "-2.E+00") ! -3.E+00
call checkfmt("(RU,1P,E7.1E2)", 2.5, "2.5E+00") ! 2.6E+00
call checkfmt("(RU,1P,E7.1E2)", 2.5, "2.5E+00") ! 2.6E+00
call checkfmt("(RD,1P,E8.1E2)", -2.5, "-2.5E+00") ! -2.6E+00
call checkfmt("(RU,1P,E10.4E2)", 2.5, "2.5000E+00") ! 2.5001E+00
call checkfmt("(RD,1P,E11.4E2)", -2.5, "-2.5000E+00") ! -2.5001E+00
call checkfmt("(RU,1P,G6.0E2)", 2.0, "2.E+00") ! 3.E+00
call checkfmt("(RU,1P,G6.0E2)", 2.0, "2.E+00") ! 3.E+00
call checkfmt("(RD,1P,G7.0E2)", -2.0, "-2.E+00") ! -3.E+00
call checkfmt("(RU,1P,G10.4E2)", 2.3456e5, "2.3456E+05") ! 2.3457E+05
call checkfmt("(RD,1P,G11.4E2)", -2.3456e5, "-2.3456E+05") ! -2.3457E+05