diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-03-24 16:31:57 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-03-24 16:31:57 +0000 |
| commit | ba77f7bad0f0898454cdef193a24a825cbc3f953 (patch) | |
| tree | a609378fc75c2514232a66dfea13745b5218ac55 /gcc/fortran | |
| parent | a199d5e74bf37ee4306c70a03c6c58f9935d54c3 (diff) | |
| download | gcc-ba77f7bad0f0898454cdef193a24a825cbc3f953.zip gcc-ba77f7bad0f0898454cdef193a24a825cbc3f953.tar.gz gcc-ba77f7bad0f0898454cdef193a24a825cbc3f953.tar.bz2 | |
re PR fortran/42651 (Functions with result: Wrongly accepts attributes to function name)
2018-03-24 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/42651
* decl.c (check_function_name): Improved error message
(gfc_match_volatile, gfc_match_asynchronous) Use check_function_name.
2018-03-24 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/42651
* gfortran.dg/pr42651.f90: New test.
* gfortran.dg/func_result_7.f90: Update error message.
From-SVN: r258834
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 64142c5..2cf32f3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-03-24 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/42651 + * decl.c (check_function_name): Improved error message + (gfc_match_volatile, gfc_match_asynchronous) Use check_function_name. + 2018-03-22 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/84922 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index a826890..dce9dd2 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2253,7 +2253,9 @@ check_function_name (char *name) && strcmp (block->result->name, "ppr@") != 0 && strcmp (block->name, name) == 0) { - gfc_error ("Function name %qs not allowed at %C", name); + gfc_error ("RESULT variable %qs at %L prohibits FUNCTION name %qs at %C " + "from appearing in a specification statement", + block->result->name, &block->result->declared_at, name); return false; } } @@ -9102,6 +9104,7 @@ match gfc_match_volatile (void) { gfc_symbol *sym; + char *name; match m; if (!gfc_notify_std (GFC_STD_F2003, "VOLATILE statement at %C")) @@ -9123,6 +9126,10 @@ gfc_match_volatile (void) switch (m) { case MATCH_YES: + name = XCNEWVAR (char, strlen (sym->name) + 1); + strcpy (name, sym->name); + if (!check_function_name (name)) + return MATCH_ERROR; /* F2008, C560+C561. VOLATILE for host-/use-associated variable or for variable in a BLOCK which is defined outside of the BLOCK. */ if (sym->ns != gfc_current_ns && sym->attr.codimension) @@ -9161,6 +9168,7 @@ match gfc_match_asynchronous (void) { gfc_symbol *sym; + char *name; match m; if (!gfc_notify_std (GFC_STD_F2003, "ASYNCHRONOUS statement at %C")) @@ -9182,6 +9190,10 @@ gfc_match_asynchronous (void) switch (m) { case MATCH_YES: + name = XCNEWVAR (char, strlen (sym->name) + 1); + strcpy (name, sym->name); + if (!check_function_name (name)) + return MATCH_ERROR; if (!gfc_add_asynchronous (&sym->attr, sym->name, &gfc_current_locus)) return MATCH_ERROR; goto next_item; |