diff options
| author | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-07 22:16:13 +0000 |
|---|---|---|
| committer | tobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-07 22:16:13 +0000 |
| commit | 950683edf26ef21d0fc72f2b0470abc3a13f4ab8 (patch) | |
| tree | e57f670abf097dfcf0ab3eda1878922121626708 /gcc/fortran/primary.c | |
| parent | daa4e295752aca4a0cda33ea5e05af597382d12d (diff) | |
| download | gcc-950683edf26ef21d0fc72f2b0470abc3a13f4ab8.tar.gz | |
* gfortran.h (gfc_add_dimension, gfc_add_result, gfc_add_save,
gfc_add_dummy, gfc_add_generic, gfc_add_in_common, gfc_add_data,
gfc_add_in_namelist, gfc_add_sequence, gfc_add_function,
gfc_add_subroutine, gfc_add_access, gfc_add_flavor, gfc_add_entry,
gfc_add_procedure): Add argument.
* array.c (gfc_set_array_spec), decl.c (var_element, get_proc_name,
gfc_match_null, match_type_spec, match_attr_spec,
gfc_match_formal_arglist, match_result, gfc_match_function_decl):
Update callers to match.
(gfc_match_entry) : Likewise, fix comment typo.
(gfc_match_subroutine, attr_decl1, gfc_add_dimension,
access_attr_decl, do_parm, gfc_match_save, gfc_match_modproc,
gfc_match_derived_decl): Update callers.
* interface.c (gfc_match_interface): Likewise.
* match.c (gfc_match_label, gfc_add_flavor,
gfc_match_call, gfc_match_common, gfc_match_block_data,
gfc_match_namelist, gfc_match_module, gfc_match_st_function):
Likewise.
* parse.c (parse_derived, parse_interface, parse_contained),
primary.c (gfc_match_rvalue, gfc_match_variable): Likewise.
* resolve.c (resolve_formal_arglist, resolve_entries): Update callers.
* symbol.c (check_conflict, check_used): Add new 'name' argument,
use when printing error message.
(gfc_add_dimension, gfc_add_result, gfc_add_save, gfc_add_dummy,
gfc_add_generic, gfc_add_in_common, gfc_add_data,
gfc_add_in_namelist, gfc_add_sequence, gfc_add_function,
gfc_add_subroutine, gfc_add_access, gfc_add_flavor, gfc_add_entry,
gfc_add_procedure): Add new 'name' argument. Pass along to
check_conflict and check_used.
(gfc_add_allocatable, gfc_add_external, gfc_add_intrinsic,
gfc_add_optional, gfc_add_pointer, gfc_add_target, gfc_add_elemental,
gfc_add_pure, gfc_add_recursive, gfc_add_intent,
gfc_add_explicit_interface, gfc_copy_attr): Pass NULL for new
argument in calls to any of the modified functions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94718 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/primary.c')
| -rw-r--r-- | gcc/fortran/primary.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index a2d1d1f5004..f122779b136 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -1877,7 +1877,7 @@ gfc_match_rvalue (gfc_expr ** result) e->rank = sym->as->rank; if (!sym->attr.function - && gfc_add_function (&sym->attr, NULL) == FAILURE) + && gfc_add_function (&sym->attr, sym->name, NULL) == FAILURE) { m = MATCH_ERROR; break; @@ -1905,7 +1905,8 @@ gfc_match_rvalue (gfc_expr ** result) if (sym->attr.dimension) { - if (gfc_add_flavor (&sym->attr, FL_VARIABLE, NULL) == FAILURE) + if (gfc_add_flavor (&sym->attr, FL_VARIABLE, + sym->name, NULL) == FAILURE) { m = MATCH_ERROR; break; @@ -1930,7 +1931,8 @@ gfc_match_rvalue (gfc_expr ** result) e->symtree = symtree; e->expr_type = EXPR_VARIABLE; - if (gfc_add_flavor (&sym->attr, FL_VARIABLE, NULL) == FAILURE) + if (gfc_add_flavor (&sym->attr, FL_VARIABLE, + sym->name, NULL) == FAILURE) { m = MATCH_ERROR; break; @@ -1964,7 +1966,8 @@ gfc_match_rvalue (gfc_expr ** result) e->expr_type = EXPR_VARIABLE; if (sym->attr.flavor != FL_VARIABLE - && gfc_add_flavor (&sym->attr, FL_VARIABLE, NULL) == FAILURE) + && gfc_add_flavor (&sym->attr, FL_VARIABLE, + sym->name, NULL) == FAILURE) { m = MATCH_ERROR; break; @@ -1990,7 +1993,7 @@ gfc_match_rvalue (gfc_expr ** result) e->expr_type = EXPR_FUNCTION; if (!sym->attr.function - && gfc_add_function (&sym->attr, NULL) == FAILURE) + && gfc_add_function (&sym->attr, sym->name, NULL) == FAILURE) { m = MATCH_ERROR; break; @@ -2072,7 +2075,8 @@ gfc_match_variable (gfc_expr ** result, int equiv_flag) break; case FL_UNKNOWN: - if (gfc_add_flavor (&sym->attr, FL_VARIABLE, NULL) == FAILURE) + if (gfc_add_flavor (&sym->attr, FL_VARIABLE, + sym->name, NULL) == FAILURE) return MATCH_ERROR; break; |