mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 22:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update file position for inquire lazily.

Browse Source 
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
This commit is contained in:
Janne Blomqvist 2011-10-31 16:59:19 +02:00
parent 3469bd8660
commit 08810e5257
7 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-31 Janne Blomqvist <jb@gcc.gnu.org>
* gfortran.dg/inquire_5.f90: Update testcase to match the standard
and current implementation.
2011-10-31 Paul Brook <paul@codesourcery.com>
* gcc.dg/constructor-1.c: New test.

5
gcc/testsuite/gfortran.dg/inquire_5.f90
View File

@ -1,11 +1,10 @@
! { dg-do run { target fd_truncate } }
! { dg-options "-std=legacy" }
!
! pr19314 inquire(..position=..) segfaults
! test by Thomas.Koenig@online.de
! bdavis9659@comcast.net
implicit none
character*20 chr
character(len=20) chr
open(7,STATUS='SCRATCH')
inquire(7,position=chr)
if (chr.NE.'ASIS') CALL ABORT
@ -31,7 +30,7 @@
write(7,*)'this is another record'
backspace(7)
inquire(7,position=chr)
if (chr.NE.'ASIS') CALL ABORT
if (chr .NE. 'UNSPECIFIED') CALL ABORT
rewind(7)
inquire(7,position=chr)
if (chr.NE.'REWIND') CALL ABORT

10
libgfortran/ChangeLog
View File

@ -1,3 +1,13 @@
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.
2011-10-31 Janne Blomqvist <jb@gcc.gnu.org>
* io/unix.h (struct stream): Add size function pointer.

48
libgfortran/io/inquire.c
View File

@ -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);
}

3
libgfortran/io/io.h
View File

@ -608,9 +608,6 @@ internal_proto(get_unit);
extern void unlock_unit (gfc_unit *);
internal_proto(unlock_unit);
extern void update_position (gfc_unit *);
internal_proto(update_position);
extern void finish_last_advance_record (gfc_unit *u);
internal_proto (finish_last_advance_record);

5
libgfortran/io/transfer.c
View File

@ -3343,9 +3343,10 @@ next_record (st_parameter_dt *dtp, int done)
if (!is_stream_io (dtp))
{
/* Keep position up to date for INQUIRE */
/* Since we have changed the position, set it to unspecified so
that INQUIRE(POSITION=) knows it needs to look into it. */
if (done)
update_position (dtp->u.p.current_unit);
dtp->u.p.current_unit->flags.position = POSITION_UNSPECIFIED;
dtp->u.p.current_unit->current_record = 0;
if (dtp->u.p.current_unit->flags.access == ACCESS_DIRECT)

20
libgfortran/io/unit.c
View File

@ -706,26 +706,6 @@ close_units (void)
}
/* update_position()-- Update the flags position for later use by inquire. */
void
update_position (gfc_unit *u)
{
/* If unit is not seekable, this makes no sense (and the standard is
silent on this matter), and thus we don't change the position for
a non-seekable file. */
gfc_offset cur = stell (u->s);
if (cur == -1)
return;
else if (cur == 0)
u->flags.position = POSITION_REWIND;
else if (ssize (u->s) == cur)
u->flags.position = POSITION_APPEND;
else
u->flags.position = POSITION_ASIS;
}
/* High level interface to truncate a file, i.e. flush format buffers,
and generate an error or set some flags. Just like POSIX
ftruncate, returns 0 on success, -1 on failure. */