git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libfortran/56737 (Wrong I/O result with format cache for Hollerith strings) 

2012-03-29  Tobias Burnus  <burnus@net-b.de>

        PR fortran/56737
        * io/format.c (parse_format_list): Also cache FMT_STRING.
        (parse_format): Update call.

From-SVN: r197230
This commit is contained in:
Tobias Burnus 2013-03-29 10:39:47 +01:00 committed by Tobias Burnus
parent d80b9b4777
commit 357aee9210
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-29 Tobias Burnus <burnus@net-b.de>
PR fortran/56737
* io/format.c (parse_format_list): Also cache FMT_STRING.
(parse_format): Update call.
2013-03-29 Tobias Burnus <burnus@net-b.de> 2013-03-29 Tobias Burnus <burnus@net-b.de>
PR fortran/56737 PR fortran/56737

18
libgfortran/io/format.c
View File

@ -586,16 +586,15 @@ format_lex (format_data *fmt)
* parenthesis node which contains the rest of the list. */ * parenthesis node which contains the rest of the list. */
static fnode * static fnode *
parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd) parse_format_list (st_parameter_dt *dtp, bool *seen_dd)
{ {
fnode *head, *tail; fnode *head, *tail;
format_token t, u, t2; format_token t, u, t2;
int repeat; int repeat;
format_data *fmt = dtp->u.p.fmt; format_data *fmt = dtp->u.p.fmt;
bool saveit, seen_data_desc = false; bool seen_data_desc = false;
head = tail = NULL; head = tail = NULL;
saveit = *save_ok;
/* Get the next format item */ /* Get the next format item */
format_item: format_item:
@ -612,7 +611,7 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd)
} }
get_fnode (fmt, &head, &tail, FMT_LPAREN); get_fnode (fmt, &head, &tail, FMT_LPAREN);
tail->repeat = -2; /* Signifies unlimited format. */ tail->repeat = -2; /* Signifies unlimited format. */
tail->u.child = parse_format_list (dtp, &saveit, &seen_data_desc); tail->u.child = parse_format_list (dtp, &seen_data_desc);
if (fmt->error != NULL) if (fmt->error != NULL)
goto finished; goto finished;
if (!seen_data_desc) if (!seen_data_desc)
@ -631,7 +630,7 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd)
case FMT_LPAREN: case FMT_LPAREN:
get_fnode (fmt, &head, &tail, FMT_LPAREN); get_fnode (fmt, &head, &tail, FMT_LPAREN);
tail->repeat = repeat; tail->repeat = repeat;
tail->u.child = parse_format_list (dtp, &saveit, &seen_data_desc); tail->u.child = parse_format_list (dtp, &seen_data_desc);
*seen_dd = seen_data_desc; *seen_dd = seen_data_desc;
if (fmt->error != NULL) if (fmt->error != NULL)
goto finished; goto finished;
@ -659,7 +658,7 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd)
case FMT_LPAREN: case FMT_LPAREN:
get_fnode (fmt, &head, &tail, FMT_LPAREN); get_fnode (fmt, &head, &tail, FMT_LPAREN);
tail->repeat = 1; tail->repeat = 1;
tail->u.child = parse_format_list (dtp, &saveit, &seen_data_desc); tail->u.child = parse_format_list (dtp, &seen_data_desc);
*seen_dd = seen_data_desc; *seen_dd = seen_data_desc;
if (fmt->error != NULL) if (fmt->error != NULL)
goto finished; goto finished;
@ -723,8 +722,6 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd)
goto between_desc; goto between_desc;
case FMT_STRING: case FMT_STRING:
/* TODO: Find out why it is necessary to turn off format caching. */
saveit = false;
get_fnode (fmt, &head, &tail, FMT_STRING); get_fnode (fmt, &head, &tail, FMT_STRING);
tail->u.string.p = fmt->string; tail->u.string.p = fmt->string;
tail->u.string.length = fmt->value; tail->u.string.length = fmt->value;
@ -1104,8 +1101,6 @@ parse_format_list (st_parameter_dt *dtp, bool *save_ok, bool *seen_dd)
finished: finished:
*save_ok = saveit;
return head; return head;
} }
@ -1255,8 +1250,7 @@ parse_format (st_parameter_dt *dtp)
fmt->avail++; fmt->avail++;
if (format_lex (fmt) == FMT_LPAREN) if (format_lex (fmt) == FMT_LPAREN)
fmt->array.array[0].u.child = parse_format_list (dtp, &format_cache_ok, fmt->array.array[0].u.child = parse_format_list (dtp, &seen_data_desc);
&seen_data_desc);
else else
fmt->error = "Missing initial left parenthesis in format"; fmt->error = "Missing initial left parenthesis in format";