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

re PR fortran/30435 (Slash at end of input not recognized according to standard) 

2007-01-12  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/30435
	* io/list_read.c (finish_separator): Don't call next_record.
	(list_formatted_read_scalar): Clean up some comments and whitespace.
	(nml_read_obj): Whitespace fix.

From-SVN: r120737
This commit is contained in:
Jerry DeLisle 2007-01-12 23:10:27 +00:00
parent 714f737ffa
commit b8df885f63
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgfortran/ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-12 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/30435
* io/list_read.c (finish_separator): Don't call next_record.
(list_formatted_read_scalar): Clean up some comments and whitespace.
(nml_read_obj): Whitespace fix.
2007-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2007-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/30162 PR libgfortran/30162

14
libgfortran/io/list_read.c
View File

@ -362,7 +362,8 @@ finish_separator (st_parameter_dt *dtp)
case '/': case '/':
dtp->u.p.input_complete = 1; dtp->u.p.input_complete = 1;
if (!dtp->u.p.namelist_mode) next_record (dtp, 0); if (!dtp->u.p.namelist_mode)
return;
break; break;
case '\n': case '\n':
@ -1492,15 +1493,16 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, int kind,
c = eat_spaces (dtp); c = eat_spaces (dtp);
if (is_separator (c)) if (is_separator (c))
{ /* Found a null value. */ {
/* Found a null value. */
eat_separator (dtp); eat_separator (dtp);
dtp->u.p.repeat_count = 0; dtp->u.p.repeat_count = 0;
/* eat_separator sets this flag if the separator was a comma */ /* eat_separator sets this flag if the separator was a comma. */
if (dtp->u.p.comma_flag) if (dtp->u.p.comma_flag)
goto cleanup; goto cleanup;
/* eat_separator sets this flag if the separator was a \n or \r */ /* eat_separator sets this flag if the separator was a \n or \r. */
if (dtp->u.p.at_eol) if (dtp->u.p.at_eol)
finish_separator (dtp); finish_separator (dtp);
else else
@ -1525,7 +1527,7 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, int kind,
else else
{ {
eat_spaces (dtp); eat_spaces (dtp);
/* trailing spaces prior to end of line */ /* Trailing spaces prior to end of line. */
if (dtp->u.p.at_eol) if (dtp->u.p.at_eol)
finish_separator (dtp); finish_separator (dtp);
} }
@ -2041,7 +2043,7 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info * nl, index_type offset,
index_type dlen; index_type dlen;
index_type m; index_type m;
index_type obj_name_len; index_type obj_name_len;
void * pdata ; void * pdata;
/* This object not touched in name parsing. */ /* This object not touched in name parsing. */