procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/79968 (diagnostics: merge similar diagnostics containing -fdec-structure)

Browse source 
2017-05-18  Fritz Reese <fritzoreese@gmail.com>

    PR fortran/79968

    gcc/fortran/ChangeLog:

	PR fortran/79968
	* decl.c (match_attr_spec, gfc_match_automatic,
	gfc_match_static, gfc_match_structure_decl): Unify diagnostic
	errors regarding -fdec options.
	* io.c (match_dec_etag, match_dec_vtag, match_dec_ftag): Ditto.

From-SVN: r248188
This commit is contained in:
Fritz Reese 2017-05-18 10:24:37 +00:00 • committed by Fritz Reese
parent 8268fc6022
commit cf0042303e
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View file

@ -1,3 +1,11 @@
2017-05-18 Fritz Reese <fritzoreese@gmail.com>
PR fortran/79968
* decl.c (match_attr_spec, gfc_match_automatic,
gfc_match_static, gfc_match_structure_decl): Unify diagnostic
errors regarding -fdec options.
* io.c (match_dec_etag, match_dec_vtag, match_dec_ftag): Ditto.
2017-05-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/80741

18
gcc/fortran/decl.c
View file

@ -4230,7 +4230,8 @@ match_attr_spec (void)
if ((d == DECL_STATIC || d == DECL_AUTOMATIC)
&& !flag_dec_static)
{
gfc_error ("%s at %L is a DEC extension, enable with -fdec-static",
gfc_error ("%s at %L is a DEC extension, enable with "
"%<-fdec-static%>",
d == DECL_STATIC ? "STATIC" : "AUTOMATIC", &seen_at[d]);
m = MATCH_ERROR;
goto cleanup;
@ -7909,8 +7910,10 @@ gfc_match_automatic (void)
if (!flag_dec_static)
{
gfc_error ("AUTOMATIC at %C is a DEC extension, enable with "
"-fdec-static");
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec-static%>",
"AUTOMATIC"
);
return MATCH_ERROR;
}
@ -7963,7 +7966,9 @@ gfc_match_static (void)
if (!flag_dec_static)
{
gfc_error ("STATIC at %C is a DEC extension, enable with -fdec-static");
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec-static%>",
"STATIC");
return MATCH_ERROR;
}
@ -8722,8 +8727,9 @@ gfc_match_structure_decl (void)
if (!flag_dec_structure)
{
gfc_error ("STRUCTURE at %C is a DEC extension, enable with "
"-fdec-structure");
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec-structure%>",
"STRUCTURE");
return MATCH_ERROR;
}

12
gcc/fortran/io.c
View file

@ -1515,8 +1515,8 @@ match_dec_etag (const io_tag *tag, gfc_expr **e)
return m;
else if (m != MATCH_NO)
{
gfc_error ("%s is a DEC extension at %C, re-compile with "
"-fdec to enable", tag->name);
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec%>", tag->name);
return MATCH_ERROR;
}
return m;
@ -1532,8 +1532,8 @@ match_dec_vtag (const io_tag *tag, gfc_expr **e)
return m;
else if (m != MATCH_NO)
{
gfc_error ("%s is a DEC extension at %C, re-compile with "
"-fdec to enable", tag->name);
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec%>", tag->name);
return MATCH_ERROR;
}
return m;
@ -1553,8 +1553,8 @@ match_dec_ftag (const io_tag *tag, gfc_open *o)
if (!flag_dec)
{
gfc_error ("%s is a DEC extension at %C, re-compile with "
"-fdec to enable", tag->name);
gfc_error ("%s at %C is a DEC extension, enable with "
"%<-fdec%>", tag->name);
return MATCH_ERROR;
}