summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authortobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-15 18:10:06 +0000
committertobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-15 18:10:06 +0000
commitb9da0959bae884f256290032555e2c9aea6793c5 (patch)
treee63b96a94a55aed18f6081e23cd2261a095ebb00 /gcc
parentd88b1bc07a5646f2894b9557d47b41e0746c5a15 (diff)
downloadgcc-b9da0959bae884f256290032555e2c9aea6793c5.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81892 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/primary.c9
-rw-r--r--gcc/testsuite/ChangeLog1
-rw-r--r--gcc/testsuite/gfortran.fortran-torture/compile/data_1.f904
4 files changed, 16 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 16ea4470998..549b82daeac 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
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
* primary.c (match_structure_constructor): Rename ...
(gfc_match_structure_constructor): ... to this. Make non-static.
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