diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/dump-parse-tree.c | 7 | ||||
| -rw-r--r-- | gcc/fortran/match.c | 26 |
3 files changed, 31 insertions, 8 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 679729b..1210aab 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-05-09 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> + + * match.c (gfc_match_return): Only require space after keyword when + it is obligatory. Only give stdwarn to after matching is successful. + * dump-parse-tree.c (gfc_show_symbol): Deal with alternate returns. + 2005-05-08 Kazu Hirata <kazu@cs.umass.edu> * intrinsic.texi: Fix typos. diff --git a/gcc/fortran/dump-parse-tree.c b/gcc/fortran/dump-parse-tree.c index 61e5568..70f91e4 100644 --- a/gcc/fortran/dump-parse-tree.c +++ b/gcc/fortran/dump-parse-tree.c @@ -665,7 +665,12 @@ gfc_show_symbol (gfc_symbol * sym) gfc_status ("Formal arglist:"); for (formal = sym->formal; formal; formal = formal->next) - gfc_status (" %s", formal->sym->name); + { + if (formal->sym != NULL) + gfc_status (" %s", formal->sym->name); + else + gfc_status (" [Alt Return]"); + } } if (sym->formal_ns) diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index d81686b..741e1a3 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -1983,12 +1983,7 @@ gfc_match_return (void) gfc_expr *e; match m; gfc_compile_state s; - - gfc_enclosing_unit (&s); - if (s == COMP_PROGRAM - && gfc_notify_std (GFC_STD_GNU, "Extension: RETURN statement in " - "main program at %C") == FAILURE) - return MATCH_ERROR; + int c; e = NULL; if (gfc_match_eos () == MATCH_YES) @@ -2001,7 +1996,18 @@ gfc_match_return (void) goto cleanup; } - m = gfc_match ("% %e%t", &e); + if (gfc_current_form == FORM_FREE) + { + /* The following are valid, so we can't require a blank after the + RETURN keyword: + return+1 + return(1) */ + c = gfc_peek_char (); + if (ISALPHA (c) || ISDIGIT (c)) + return MATCH_NO; + } + + m = gfc_match (" %e%t", &e); if (m == MATCH_YES) goto done; if (m == MATCH_ERROR) @@ -2014,6 +2020,12 @@ cleanup: return MATCH_ERROR; done: + gfc_enclosing_unit (&s); + if (s == COMP_PROGRAM + && gfc_notify_std (GFC_STD_GNU, "Extension: RETURN statement in " + "main program at %C") == FAILURE) + return MATCH_ERROR; + new_st.op = EXEC_RETURN; new_st.expr = e; |