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 /libgfortran | |
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 'libgfortran')
-rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
-rw-r--r-- | libgfortran/gfortran.map | 5 | ||||
-rw-r--r-- | libgfortran/runtime/stop.c | 21 |
3 files changed, 32 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 70700a3..78c6b04 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +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. + 2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. @@ -7,7 +13,7 @@ PR libfortran/43605 * io/intrinsics.c (gf_ftell): New function, seek to correct offset. - (ftell): Call gf_ftell. + (ftell): Call gf_ftell. (FTELL_SUB): Likewise. 2010-04-01 Paul Thomas <pault@gcc.gnu.org> diff --git a/libgfortran/gfortran.map b/libgfortran/gfortran.map index 3541d14..bcca957 100644 --- a/libgfortran/gfortran.map +++ b/libgfortran/gfortran.map @@ -1098,6 +1098,11 @@ GFORTRAN_1.2 { _gfortran_is_extension_of; } GFORTRAN_1.1; +GFORTRAN_1.3 { + global: + _gfortran_error_stop_string; +} GFORTRAN_1.2; + F2C_1.0 { global: _gfortran_f2c_specific__abs_c4; diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c index 8c4247d..14a88c4 100644 --- a/libgfortran/runtime/stop.c +++ b/libgfortran/runtime/stop.c @@ -1,5 +1,5 @@ /* Implementation of the STOP statement. - Copyright 2002, 2005, 2007, 2009 Free Software Foundation, Inc. + Copyright 2002, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. Contributed by Paul Brook <paul@nowt.org> This file is part of the GNU Fortran 95 runtime library (libgfortran). @@ -53,3 +53,22 @@ stop_string (const char *string, GFC_INTEGER_4 len) sys_exit (0); } + +extern void error_stop_string (const char *, GFC_INTEGER_4); +export_proto(error_stop_string); + + +/* Per Fortran 2008, section 8.4: "Execution of a STOP statement initiates + normal termination of execution. Execution of an ERROR STOP statement + initiates error termination of execution." Thus, error_stop_string returns + a nonzero exit status code. */ +void +error_stop_string (const char *string, GFC_INTEGER_4 len) +{ + st_printf ("ERROR STOP "); + while (len--) + st_printf ("%c", *(string++)); + st_printf ("\n"); + + sys_exit (1); +} |