diff options
| author | Tobias Burnus <burnus@gcc.gnu.org> | 2010-04-06 18:26:02 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2010-04-06 18:26:02 +0200 |
| commit | d0a4a61c3de7ac131afc0014c6a8970ca6dcdeca (patch) | |
| tree | 6b20ae56f767cd6edf0d68afa82cbb77738f5cfc /gcc/fortran/decl.c | |
| parent | 62daa13984dac4fbe37f94755978ad886925939d (diff) | |
| download | gcc-d0a4a61c3de7ac131afc0014c6a8970ca6dcdeca.zip gcc-d0a4a61c3de7ac131afc0014c6a8970ca6dcdeca.tar.gz gcc-d0a4a61c3de7ac131afc0014c6a8970ca6dcdeca.tar.bz2 | |
re PR fortran/39997 (Procedure(), pointer & implicit typing: rejects-valid / accepts-invalid?)
2010-04-06 Tobias Burnus <burnus@net-b.de>
PR fortran/39997
* intrinsic.c (add_functions): Add num_images.
* decl.c (gfc_match_end): Handle END CRITICAL.
* intrinsic.h (gfc_simplify_num_images): Add prototype.
* dump-parse-tree.c (show_code_node): Dump CRITICAL, ERROR STOP,
and SYNC.
* gfortran.h (gfc_statement): Add enum items for those.
(gfc_exec_op) Ditto.
(gfc_isym_id): Add num_images.
* trans-stmt.c (gfc_trans_stop): Handle ERROR STOP.
(gfc_trans_sync,gfc_trans_critical): New functions.
* trans-stmt.h (gfc_trans_stop,gfc_trans_sync,
gfc_trans_critical): Add/update prototypes.
* trans.c (gfc_trans_code): Handle CRITICAL, ERROR STOP,
and SYNC statements.
* trans.h (gfor_fndecl_error_stop_string) Add variable.
* resolve.c (resolve_sync): Add function.
(gfc_resolve_blocks): Handle CRITICAL.
(resolve_code): Handle CRITICAL, ERROR STOP,
(resolve_branch): Add CRITICAL constraint check.
and SYNC statements.
* st.c (gfc_free_statement): Add new statements.
* trans-decl.c (gfor_fndecl_error_stop_string): Global variable.
(gfc_build_builtin_function_decls): Initialize it.
* match.c (gfc_match_if): Handle ERROR STOP and SYNC.
(gfc_match_critical, gfc_match_error_stop, sync_statement,
gfc_match_sync_all, gfc_match_sync_images,
gfc_match_sync_memory):
New functions.
(match_exit_cycle): Handle CRITICAL constraint.
(gfc_match_stopcode): Handle ERROR STOP.
* match.h (gfc_match_critical, gfc_match_error_stop,
gfc_match_sync_all, gfc_match_sync_images,
gfc_match_sync_memory): Add prototype.
* parse.c (decode_statement, gfc_ascii_statement,
parse_executable): Handle new statements.
(parse_critical_block): New function.
* parse.h (gfc_compile_state): Add COMP_CRITICAL.
* intrinsic.texi (num_images): Document new function.
* simplify.c (gfc_simplify_num_images): Add function.
2010-04-06 Tobias Burnus <burnus@net-b.de>
PR fortran/39997
* gfortran.dg/coarray_1.f90: New test.
* gfortran.dg/coarray_2.f90: New test.
* gfortran.dg/coarray_3.f90: New test.
2010-04-06 Tobias Burnus <burnus@net-b.de>
PR fortran/39997
* runtime/stop.c (error_stop_string): New function.
* gfortran.map (_gfortran_error_stop_string): Add.
From-SVN: r158008
Diffstat (limited to 'gcc/fortran/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 692078a..9237503 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -5476,6 +5476,12 @@ gfc_match_end (gfc_statement *st) eos_ok = 0; break; + case COMP_CRITICAL: + *st = ST_END_CRITICAL; + target = " critical"; + eos_ok = 0; + break; + case COMP_SELECT: case COMP_SELECT_TYPE: *st = ST_END_SELECT; @@ -5534,7 +5540,8 @@ gfc_match_end (gfc_statement *st) { if (*st != ST_ENDDO && *st != ST_ENDIF && *st != ST_END_SELECT - && *st != ST_END_FORALL && *st != ST_END_WHERE && *st != ST_END_BLOCK) + && *st != ST_END_FORALL && *st != ST_END_WHERE && *st != ST_END_BLOCK + && *st != ST_END_CRITICAL) return MATCH_YES; if (!block_name) |