From: Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de>
Date: Sat, 15 May 2004 18:10:06 +0000 (+0200)
Subject: re PR fortran/13826 (Derived types in DATA statements not PARAMETERs)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=feb357a3360f03fa3439b437c0d255be0c14e54b;p=gcc.git

re PR fortran/13826 (Derived types in DATA statements not PARAMETERs)

testsuite:
PR fortran/13826
PR fortran/13940
* gfortran.fortran-torture/compile/data_1.f90: New test.
(add second test)

fortran:
* primary.c (match_boz_constant): Use gfc_notify_std() for
issuing a warning or an error.

From-SVN: r81892
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 16ea4470998..549b82daeac 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-15  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* primary.c (match_boz_constant): Use gfc_notify_std() for
+	issuing a warning or an error.
+
 2004-05-15  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	PR fortran/13826
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index d10a46244e9..0e7e7e796aa 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -255,9 +255,12 @@ match_boz_constant (gfc_expr ** result)
       rname = "octal";
       break;
     case 'x':
-      if (pedantic)
-       gfc_warning_now ("Hexadecimal constant at %C uses non-standard "
-                        "syntax. Use \"Z\" instead.");
+      if (pedantic
+         && (gfc_notify_std (GFC_STD_GNU, "Extension: Hexadecimal "
+                            "constant at %C uses non-standard syntax.")
+             == FAILURE))
+       goto backup;
+
       /* Fall through.  */
     case 'z':
       radix = 16;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d23aed287c8..c1a37d6da8f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,7 @@
 2004-05-15  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	PR fortran/13826
+	PR fortran/13940
 	* gfortran.fortran-torture/compile/data_1.f90: New test.
 
 2004-05-15  Ulrich Weigand  <uweigand@de.ibm.com>
diff --git a/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90 b/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90
index fa8ab9fe1f7..e3d65efc520 100644
--- a/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/compile/data_1.f90
@@ -5,3 +5,7 @@ END TYPE
 TYPE(a) :: y
 DATA y /a(1.)/ ! used to give an error about non-PARAMETER
 END
+! this tests the fix for PR 13940
+SUBROUTINE a
+DATA i /x'f95f95f9'/
+END