diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2011-10-31 16:59:19 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2011-10-31 16:59:19 +0200 |
| commit | 08810e5257936014e242527cdbb2de6beddf24e8 (patch) | |
| tree | 41e75a36bf344be0552dbdadfdb4a498e01f5710 /libgfortran/io/inquire.c | |
| parent | 3469bd8660b6c79a4727287ef4214d2b9c864ba6 (diff) | |
| download | gcc-08810e5257936014e242527cdbb2de6beddf24e8.zip gcc-08810e5257936014e242527cdbb2de6beddf24e8.tar.gz gcc-08810e5257936014e242527cdbb2de6beddf24e8.tar.bz2 | |
Update file position for inquire lazily.
libgfortran ChangeLog:
2011-10-31 Janne Blomqvist <jb@gcc.gnu.org>
* io/inquire.c (inquire_via_unit): Check whether we're at the
beginning or end if the position is unspecified. If the position
is not one of the 3 standard ones, return unspecified.
* io/io.h (update_position): Remove prototype.
* io/transfer.c (next_record): Set the position to unspecified,
letting inquire figure it out more exactly when needed.
* io/unit.c (update_position): Remove function.
testsuite ChangeLog:
2011-10-31 Janne Blomqvist <jb@gcc.gnu.org>
* gfortran.dg/inquire_5.f90: Update testcase to match the standard
and current implementation.
From-SVN: r180703
Diffstat (limited to 'libgfortran/io/inquire.c')
| -rw-r--r-- | libgfortran/io/inquire.c | 48 |
1 files changed, 30 insertions, 18 deletions
diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c index 252f29f..fb525ca 100644 --- a/libgfortran/io/inquire.c +++ b/libgfortran/io/inquire.c @@ -418,24 +418,36 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u) if (u == NULL || u->flags.access == ACCESS_DIRECT) p = undefined; else - switch (u->flags.position) - { - case POSITION_REWIND: - p = "REWIND"; - break; - case POSITION_APPEND: - p = "APPEND"; - break; - case POSITION_ASIS: - p = "ASIS"; - break; - default: - /* if not direct access, it must be - either REWIND, APPEND, or ASIS. - ASIS seems to be the best default */ - p = "ASIS"; - break; - } + { + /* If the position is unspecified, check if we can figure + out whether it's at the beginning or end. */ + if (u->flags.position == POSITION_UNSPECIFIED) + { + gfc_offset cur = stell (u->s); + if (cur == 0) + u->flags.position = POSITION_REWIND; + else if (cur != -1 && (ssize (u->s) == cur)) + u->flags.position = POSITION_APPEND; + } + switch (u->flags.position) + { + case POSITION_REWIND: + p = "REWIND"; + break; + case POSITION_APPEND: + p = "APPEND"; + break; + case POSITION_ASIS: + p = "ASIS"; + break; + default: + /* If the position has changed and is not rewind or + append, it must be set to a processor-dependent + value. */ + p = "UNSPECIFIED"; + break; + } + } cf_strcpy (iqp->position, iqp->position_len, p); } |