diff options
author | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-28 21:28:50 +0200 |
---|---|---|
committer | Janne Blomqvist <jb@gcc.gnu.org> | 2017-11-28 21:28:50 +0200 |
commit | 67c24a8bd6141021da49e005c0111bd42bfc7d08 (patch) | |
tree | 4255e7df80923463cf7ce62bf84f31f5f890ab13 /libgfortran/io/transfer.c | |
parent | 6df8934f6ad73b97181fc0a997b3eb8cd799b6a0 (diff) | |
download | gcc-67c24a8bd6141021da49e005c0111bd42bfc7d08.zip gcc-67c24a8bd6141021da49e005c0111bd42bfc7d08.tar.gz gcc-67c24a8bd6141021da49e005c0111bd42bfc7d08.tar.bz2 |
PR 53796 Improve INQUIRE(RECL=...) handling
The current F2018 draft (N2137) specifies behavior of the RECL=
specifier in the INQUIRE statement, where it previously was left as
undefined. Namely:
- If the unit is not connected, RECL= should be given the value -1.
- If the unit is connected with stream access, RECL= should be given
the value -2.
Further, as PR 53796 describes, the handling of RECL= is poor in other
ways as well. When the recl is set to the maximum possible
(GFC_INTEGER_8_HUGE / LLONG_MAX), which it does by default except for
preconnected units, and when INQUIRE(RECL=) is used with a 4 byte
integer, the value is truncated and the 4 byte value is thus
-1. Fixing this to generate an error is a lot of work, as currently
the truncation is done by the frontend, the library sees only an 8
byte value with no indication that the frontend is going to copy it to
a 4 byte one. Instead, this patch does a bit twiddling trick such that
the truncated 4 byte value is GFC_INTEGER_4_HUGE while still being
0.99999999 * GFC_INTEGER_8_HUGE which is large enough for all
practical purposes.
Finally, the patch removes GFORTRAN_DEFAULT_RECL which was used only
for preconnected units, and instead uses the same approach as describe
above.
Regtested on x86_64-pc-linux-gnu, Ok for trunk.
gcc/fortran/ChangeLog:
2017-11-28 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/53796
* gfortran.texi: Remove mentions of GFORTRAN_DEFAULT_RECL.
libgfortran/ChangeLog:
2017-11-28 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/53796
* io/inquire.c (inquire_via_unit): Set recl to -1 for unconnected
units.
* io/io.h (default_recl): New variable.
* io/open.c (new_unit): Set recl to default_recl for sequential,
-2 for stream access.
* io/transfer.c (read_block_form): Test against default_recl
instead of DEFAULT_RECL.
(write_block): Likewise.
* io/unit.c (init_units): Calculate max_offset, default_recl.
* libgfortran.h (DEFAULT_RECL): Remove.
* runtime/environ.c: Remove GFORTRAN_DEFAULT_RECL.
gcc/testsuite/ChangeLog:
2017-11-28 Janne Blomqvist <jb@gcc.gnu.org>
PR fortran/53796
* gfortran.dg/inquire_recl_f2018.f90: New test.
From-SVN: r255215
Diffstat (limited to 'libgfortran/io/transfer.c')
-rw-r--r-- | libgfortran/io/transfer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index acaa88a..1ac4c51 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -451,7 +451,7 @@ read_block_form (st_parameter_dt *dtp, int *nbytes) /* For preconnected units with default record length, set bytes left to unit record length and proceed, otherwise error. */ if (dtp->u.p.current_unit->unit_number == options.stdin_unit - && dtp->u.p.current_unit->recl == DEFAULT_RECL) + && dtp->u.p.current_unit->recl == default_recl) dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl; else { @@ -757,7 +757,7 @@ write_block (st_parameter_dt *dtp, int length) == options.stdout_unit || dtp->u.p.current_unit->unit_number == options.stderr_unit) - && dtp->u.p.current_unit->recl == DEFAULT_RECL)) + && dtp->u.p.current_unit->recl == default_recl)) dtp->u.p.current_unit->bytes_left = dtp->u.p.current_unit->recl; else { |