This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [patch,fortran] Harmonize gfc_notify_std (GFC_STD_F2003
- From: Tobias Burnus <burnus at net-b dot de>
- Cc: "'fortran at gcc dot gnu dot org'" <fortran at gcc dot gnu dot org>, gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Tue, 07 Nov 2006 10:33:56 +0100
- Subject: Re: [patch,fortran] Harmonize gfc_notify_std (GFC_STD_F2003
- References: <454F0555.3010102@net-b.de> <EA63DF46-CF42-4142-A517-C373CE195390@gmail.com>
FX Coudert wrote:
> I take it it regtested fine on some unmentionned platform :)
> Otherwise, pleast bootstrap & regtest before applying.
Build into an empty directory (bootstrap) && regression tested
(check-gfortran) on x86_64-unknown-linux-gnu
& checked in to trunk.
# of expected passes 15090
# of expected failures 7
# of unsupported tests 17
Tobias
Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog (Revision 118541)
+++ gcc/fortran/ChangeLog (Arbeitskopie)
@@ -1,3 +1,14 @@
+2006-11-06 Tobias Burnus <burnus@net-b.de>
+
+ * decl.c (match_attr_spec, gfc_match_enum): Unify gfc_notify_std
+ message for GFC_STD_F2003.
+ * array.c (gfc_match_array_constructor): Unify gfc_notify_std
+ message for GFC_STD_F2003.
+ * io.c (check_io_constraints): Unify gfc_notify_std message for
+ GFC_STD_F2003.
+ * resolve.c (resolve_actual_arglist): Unify gfc_notify_std message
+ for GFC_STD_F2003.
+
2006-11-06 Brooks Moses <brooks.moses@codesourcery.com>
* intrinsic.texi: Added documentation for FTELL, GETLOG, and
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (Revision 118541)
+++ gcc/fortran/decl.c (Arbeitskopie)
@@ -2191,8 +2191,8 @@
if (d == DECL_ALLOCATABLE)
{
if (gfc_notify_std (GFC_STD_F2003,
- "In the selected standard, the ALLOCATABLE "
- "attribute at %C is not allowed in a TYPE "
+ "Fortran 2003: ALLOCATABLE "
+ "attribute at %C in a TYPE "
"definition") == FAILURE)
{
m = MATCH_ERROR;
@@ -4143,7 +4143,7 @@
return m;
if (gfc_notify_std (GFC_STD_F2003,
- "New in Fortran 2003: ENUM AND ENUMERATOR at %C")
+ "Fortran 2003: ENUM AND ENUMERATOR at %C")
== FAILURE)
return MATCH_ERROR;
Index: gcc/fortran/array.c
===================================================================
--- gcc/fortran/array.c (Revision 118541)
+++ gcc/fortran/array.c (Arbeitskopie)
@@ -874,7 +874,7 @@
return MATCH_NO;
else
{
- if (gfc_notify_std (GFC_STD_F2003, "New in Fortran 2003: [...] "
+ if (gfc_notify_std (GFC_STD_F2003, "Fortran 2003: [...] "
"style array constructors at %C") == FAILURE)
return MATCH_ERROR;
end_delim = " ]";
Index: gcc/fortran/io.c
===================================================================
--- gcc/fortran/io.c (Revision 118541)
+++ gcc/fortran/io.c (Arbeitskopie)
@@ -2599,7 +2599,7 @@
if (dt->namelist != NULL)
{
if (gfc_notify_std(GFC_STD_F2003,
- "Internal file at %L is incompatible with namelist",
+ "Fortran 2003: Internal file at %L with namelist",
&expr->where) == FAILURE)
m = MATCH_ERROR;
}
Index: gcc/fortran/resolve.c
===================================================================
--- gcc/fortran/resolve.c (Revision 118541)
+++ gcc/fortran/resolve.c (Arbeitskopie)
@@ -888,7 +888,7 @@
function allowed as actual argument in F2003 and not allowed
in F95. */
gfc_notify_std (GFC_STD_F2003, "Fortran 2003: CHAR intrinsic "
- "allowed as actual argument at %L", &e->where);
+ "as actual argument at %L", &e->where);
if (sym->attr.contained && !sym->attr.use_assoc
&& sym->ns->proc_name->attr.flavor != FL_MODULE)
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (Revision 118541)
+++ gcc/testsuite/ChangeLog (Arbeitskopie)
@@ -1,3 +1,10 @@
+2006-11-06 Tobias Burnus <burnus@net-b.de>
+
+ * gfortran.dg/io_constraints_2.f90: Adjust pattern
+ for matching error messages.
+ * gfortran.dg/specifics_3.f90: Adjust pattern
+ for matching error messages.
+
2006-11-06 Janis Johnson <janis187@us.ibm.com
Bernhard Fischer <aldot@gcc.gnu.org>
Index: gcc/testsuite/gfortran.dg/io_constraints_2.f90
===================================================================
--- gcc/testsuite/gfortran.dg/io_constraints_2.f90 (Revision 118541)
+++ gcc/testsuite/gfortran.dg/io_constraints_2.f90 (Arbeitskopie)
@@ -40,7 +40,7 @@
!
! Not allowed with internal unit
!Was correctly picked up before patch.
- write(buffer, NML=NL) ! { dg-error "incompatible with namelist" }
+ write(buffer, NML=NL) ! { dg-error "Internal file at \\(1\\) with namelist" }
!Was correctly picked up before patch.
write(buffer, fmt='(i6)', REC=10) a ! { dg-error "REC tag" }
write(buffer, fmt='(i6)', END=10) a ! { dg-error "END tag" }
Index: gcc/testsuite/gfortran.dg/specifics_3.f90
===================================================================
--- gcc/testsuite/gfortran.dg/specifics_3.f90 (Revision 118541)
+++ gcc/testsuite/gfortran.dg/specifics_3.f90 (Arbeitskopie)
@@ -1,5 +1,5 @@
! { dg-do compile }
! { dg-options "-std=f95" }
intrinsic char
- call foo(char) ! { dg-error "Fortran 2003: CHAR intrinsic allowed as actual argument" }
+ call foo(char) ! { dg-error "Fortran 2003: CHAR intrinsic as actual argument" }
end