diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2011-08-14 11:37:25 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2011-08-14 11:37:25 +0200 |
| commit | bb9de0c4d08235b14fe27c7f0ab3e2eb92aa231f (patch) | |
| tree | 1e9dc32daee9818eb7ad634080d221d442ceaf43 /gcc/fortran/decl.c | |
| parent | f3713778332ef6b2d10c3981ebcc6ab8540b3f85 (diff) | |
| download | gcc-bb9de0c4d08235b14fe27c7f0ab3e2eb92aa231f.zip gcc-bb9de0c4d08235b14fe27c7f0ab3e2eb92aa231f.tar.gz gcc-bb9de0c4d08235b14fe27c7f0ab3e2eb92aa231f.tar.bz2 | |
re PR fortran/50073 (gfortran must not accept function name when result name is present)
2011-08-14 Janus Weil <janus@gcc.gnu.org>
PR fortran/50073
* decl.c (check_function_name): New function, separated off from
'variable_decl' and slightly extended.
(variable_decl,attr_decl1): Call it.
2011-08-14 Janus Weil <janus@gcc.gnu.org>
PR fortran/50073
* gfortran.dg/func_result_7.f90: New.
From-SVN: r177745
Diffstat (limited to 'gcc/fortran/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 661bb14..18e2651 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1729,6 +1729,30 @@ match_pointer_init (gfc_expr **init, int procptr) } +static gfc_try +check_function_name (char *name) +{ + /* In functions that have a RESULT variable defined, the function name always + refers to function calls. Therefore, the name is not allowed to appear in + specification statements. When checking this, be careful about + 'hidden' procedure pointer results ('ppr@'). */ + + if (gfc_current_state () == COMP_FUNCTION) + { + gfc_symbol *block = gfc_current_block (); + if (block && block->result && block->result != block + && strcmp (block->result->name, "ppr@") != 0 + && strcmp (block->name, name) == 0) + { + gfc_error ("Function name '%s' not allowed at %C", name); + return FAILURE; + } + } + + return SUCCESS; +} + + /* Match a variable name with an optional initializer. When this subroutine is called, a variable is expected to be parsed next. Depending on what is happening at the moment, updates either the @@ -1935,17 +1959,9 @@ variable_decl (int elem) goto cleanup; } } - - /* In functions that have a RESULT variable defined, the function - name always refers to function calls. Therefore, the name is - not allowed to appear in specification statements. */ - if (gfc_current_state () == COMP_FUNCTION - && gfc_current_block () != NULL - && gfc_current_block ()->result != NULL - && gfc_current_block ()->result != gfc_current_block () - && strcmp (gfc_current_block ()->name, name) == 0) + + if (check_function_name (name) == FAILURE) { - gfc_error ("Function name '%s' not allowed at %C", name); m = MATCH_ERROR; goto cleanup; } @@ -5995,6 +6011,12 @@ attr_decl1 (void) if (find_special (name, &sym, false)) return MATCH_ERROR; + if (check_function_name (name) == FAILURE) + { + m = MATCH_ERROR; + goto cleanup; + } + var_locus = gfc_current_locus; /* Deal with possible array specification for certain attributes. */ |