From 0921bc44f78c9c3326d608039d099ea672541e39 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 8 Jul 2005 12:06:57 +0200 Subject: primary.c (gfc_match_rvalue): Handle ENTRY the same way as FUNCTION. * primary.c (gfc_match_rvalue): Handle ENTRY the same way as FUNCTION. * gfortran.fortran-torture/execute/entry_10.f90: New test. From-SVN: r101758 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/primary.c | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5de8b3c..b09cb7e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2005-07-08 Jakub Jelinek + + * primary.c (gfc_match_rvalue): Handle ENTRY the same way + as FUNCTION. + 2005-07-07 Jakub Jelinek * scanner.c (load_line): Add pbuflen argument, don't make diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index f6807d5..36e5eb9 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -1846,11 +1846,24 @@ gfc_match_rvalue (gfc_expr ** result) gfc_set_sym_referenced (sym); - if (sym->attr.function && sym->result == sym - && (gfc_current_ns->proc_name == sym + if (sym->attr.function && sym->result == sym) + { + if (gfc_current_ns->proc_name == sym || (gfc_current_ns->parent != NULL - && gfc_current_ns->parent->proc_name == sym))) - goto variable; + && gfc_current_ns->parent->proc_name == sym)) + goto variable; + + if (sym->attr.entry + && (sym->ns == gfc_current_ns + || sym->ns == gfc_current_ns->parent)) + { + gfc_entry_list *el = NULL; + + for (el = sym->ns->entries; el; el = el->next) + if (sym == el->sym) + goto variable; + } + } if (sym->attr.function || sym->attr.external || sym->attr.intrinsic) goto function0; -- cgit v1.1