From: Tobias Burnus Date: Tue, 7 Nov 2006 09:11:08 +0000 (+0100) Subject: decl.c (match_attr_spec, [...]): Unify gfc_notify_std message for GFC_STD_F2003. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa4183d8a5177cd45be6c0514be1b1b6efe7e890;p=gcc.git decl.c (match_attr_spec, [...]): Unify gfc_notify_std message for GFC_STD_F2003. fortran/ 2006-11-06 Tobias Burnus * 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. testsuite/ 2006-11-06 Tobias Burnus * gfortran.dg/io_constraints_2.f90: Adjust pattern for matching error messages. * gfortran.dg/specifics_3.f90: Adjust pattern for matching error messages. From-SVN: r118542 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1e3defe5381..5cec70a8ff0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2006-11-06 Tobias Burnus + + * 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 * intrinsic.texi: Added documentation for FTELL, GETLOG, and diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index fa38ab9c956..ace828c1c2a 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -874,7 +874,7 @@ gfc_match_array_constructor (gfc_expr ** result) 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 = " ]"; diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 84797b7fdc0..e326b94e8c8 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2191,8 +2191,8 @@ match_attr_spec (void) 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 @@ gfc_match_enum (void) 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; diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index ae9df4a967b..3da0d2642a9 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -2599,7 +2599,7 @@ if (condition) \ 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; } diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index d3722e61f75..02069156ab9 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -888,7 +888,7 @@ resolve_actual_arglist (gfc_actual_arglist * arg) 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) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f9baa74b8a3..b133c30ce6a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2006-11-06 Tobias Burnus + + * 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 diff --git a/gcc/testsuite/gfortran.dg/io_constraints_2.f90 b/gcc/testsuite/gfortran.dg/io_constraints_2.f90 index 0b2c2049adf..73c4979f2a9 100644 --- a/gcc/testsuite/gfortran.dg/io_constraints_2.f90 +++ b/gcc/testsuite/gfortran.dg/io_constraints_2.f90 @@ -40,7 +40,7 @@ end module global ! ! 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" } diff --git a/gcc/testsuite/gfortran.dg/specifics_3.f90 b/gcc/testsuite/gfortran.dg/specifics_3.f90 index 3b5ddada426..7f5c427dd62 100644 --- a/gcc/testsuite/gfortran.dg/specifics_3.f90 +++ b/gcc/testsuite/gfortran.dg/specifics_3.f90 @@ -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