OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl.c (match_attr_spec, [...]): Unify gfc_notify_std message for GFC_STD_F2003. 

fortran/
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.

testsuite/
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.

From-SVN: r118542
This commit is contained in:
Tobias Burnus 2006-11-07 10:11:08 +01:00 committed by Tobias Burnus
parent 9519e677aa
commit aa4183d8a5
8 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/fortran/ChangeLog
View File

@ -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> 2006-11-06 Brooks Moses <brooks.moses@codesourcery.com>
* intrinsic.texi: Added documentation for FTELL, GETLOG, and * intrinsic.texi: Added documentation for FTELL, GETLOG, and

2
gcc/fortran/array.c
View File

@ -874,7 +874,7 @@ gfc_match_array_constructor (gfc_expr ** result)
return MATCH_NO; return MATCH_NO;
else 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) "style array constructors at %C") == FAILURE)
return MATCH_ERROR; return MATCH_ERROR;
end_delim = " ]"; end_delim = " ]";

6
gcc/fortran/decl.c
View File

@ -2191,8 +2191,8 @@ match_attr_spec (void)
if (d == DECL_ALLOCATABLE) if (d == DECL_ALLOCATABLE)
{ {
if (gfc_notify_std (GFC_STD_F2003, if (gfc_notify_std (GFC_STD_F2003,
"In the selected standard, the ALLOCATABLE " "Fortran 2003: ALLOCATABLE "
"attribute at %C is not allowed in a TYPE " "attribute at %C in a TYPE "
"definition") == FAILURE) "definition") == FAILURE)
{ {
m = MATCH_ERROR; m = MATCH_ERROR;
@ -4143,7 +4143,7 @@ gfc_match_enum (void)
return m; return m;
if (gfc_notify_std (GFC_STD_F2003, if (gfc_notify_std (GFC_STD_F2003,
"New in Fortran 2003: ENUM AND ENUMERATOR at %C") "Fortran 2003: ENUM AND ENUMERATOR at %C")
== FAILURE) == FAILURE)
return MATCH_ERROR; return MATCH_ERROR;

2
gcc/fortran/io.c
View File

@ -2599,7 +2599,7 @@ if (condition) \
if (dt->namelist != NULL) if (dt->namelist != NULL)
{ {
if (gfc_notify_std(GFC_STD_F2003, 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) &expr->where) == FAILURE)
m = MATCH_ERROR; m = MATCH_ERROR;
} }

2
gcc/fortran/resolve.c
View File

@ -888,7 +888,7 @@ resolve_actual_arglist (gfc_actual_arglist * arg)
function allowed as actual argument in F2003 and not allowed function allowed as actual argument in F2003 and not allowed
in F95. */ in F95. */
gfc_notify_std (GFC_STD_F2003, "Fortran 2003: CHAR intrinsic " 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 if (sym->attr.contained && !sym->attr.use_assoc
&& sym->ns->proc_name->attr.flavor != FL_MODULE) && sym->ns->proc_name->attr.flavor != FL_MODULE)

7
gcc/testsuite/ChangeLog
View File

@ -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 2006-11-06 Janis Johnson <janis187@us.ibm.com
Bernhard Fischer <aldot@gcc.gnu.org> Bernhard Fischer <aldot@gcc.gnu.org>

2
gcc/testsuite/gfortran.dg/io_constraints_2.f90
View File

@ -40,7 +40,7 @@ end module global
! !
! Not allowed with internal unit ! Not allowed with internal unit
!Was correctly picked up before patch. !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. !Was correctly picked up before patch.
write(buffer, fmt='(i6)', REC=10) a ! { dg-error "REC tag" } write(buffer, fmt='(i6)', REC=10) a ! { dg-error "REC tag" }
write(buffer, fmt='(i6)', END=10) a ! { dg-error "END tag" } write(buffer, fmt='(i6)', END=10) a ! { dg-error "END tag" }

2
gcc/testsuite/gfortran.dg/specifics_3.f90
View File

@ -1,5 +1,5 @@
! { dg-do compile } ! { dg-do compile }
! { dg-options "-std=f95" } ! { dg-options "-std=f95" }
intrinsic char 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 end