From: Tobias Burnus <burnus@net-b.de>
Date: Wed, 22 Feb 2012 17:25:11 +0000 (+0100)
Subject: re PR fortran/52335 (I/O: -std=f95 rejects valid DELIM= in OPEN)
X-Git-Tag: releases/gcc-4.7.0~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ff89fcbf2b77347a477f4f0725e1a11894eaf6d;p=thirdparty%2Fgcc.git

re PR fortran/52335 (I/O: -std=f95 rejects valid DELIM= in OPEN)

2012-02-22  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52335
        * io.c (gfc_match_open): Remove bogus F2003 DELIM= check.

2012-02-22  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52335
        * gfortran.dg/io_constraints_10.f90: New.

From-SVN: r184485
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f6b54d7767f3..babf8b56c822 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/52335
+	* io.c (gfc_match_open): Remove bogus F2003 DELIM= check.
+
 2012-02-18  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/52295
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index b7eac6c9be19..7caadc5056cd 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -1947,10 +1947,6 @@ gfc_match_open (void)
   /* Checks on the DELIM specifier.  */
   if (open->delim)
     {
-      if (gfc_notify_std (GFC_STD_F2003, "Fortran 2003: DELIM= at %C "
-	  "not allowed in Fortran 95") == FAILURE)
-	goto cleanup;
-
       if (open->delim->expr_type == EXPR_CONSTANT)
 	{
 	  static const char *delim[] = { "APOSTROPHE", "QUOTE", "NONE", NULL };
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 14fcb23cd079..d52a3c94018d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/52335
+	* gfortran.dg/io_constraints_10.f90: New.
+
 2012-02-22  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	* lib/target-supports.exp (check_effective_target_vect_condition):
diff --git a/gcc/testsuite/gfortran.dg/io_constraints_10.f90 b/gcc/testsuite/gfortran.dg/io_constraints_10.f90
new file mode 100644
index 000000000000..bb756aa2bc83
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/io_constraints_10.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! { dg-options "-std=f95" }
+!
+! PR fortran/52335
+!
+
+integer :: lun
+character(len=20) :: str
+
+! VALID Fortran 95:
+open(unit=lun,file=str,delim='apostrophe',status='old')
+inquire(lun, delim=str)
+
+! Fortran 2003:
+write(*,*, delim='apostrophe') 'a' ! { dg-error "Fortran 2003: DELIM= at .1. not allowed in Fortran 95" }
+end