===================================================================
@@ -768,7 +768,7 @@ read_logical (st_parameter_dt *dtp, int length)
hit_eof (dtp);
return;
}
- else
+ else if (c != '\n')
eat_line (dtp);
sprintf (message, "Bad logical value while reading item %d",
dtp->u.p.item_count);
@@ -906,7 +906,7 @@ read_integer (st_parameter_dt *dtp, int length)
hit_eof (dtp);
return;
}
- else
+ else if (c != '\n')
eat_line (dtp);
sprintf (message, "Bad integer for item %d in list input",
dtp->u.p.item_count);
@@ -1104,6 +1104,7 @@ parse_real (st_parameter_dt *dtp, void *buffer, in
if ((c = next_char (dtp)) == EOF)
goto bad;
+
if (c == '-' || c == '+')
{
push_char (dtp, c);
@@ -1162,7 +1163,6 @@ parse_real (st_parameter_dt *dtp, void *buffer, in
goto exp2;
CASE_SEPARATORS:
- unget_char (dtp, c);
goto done;
default:
@@ -1273,7 +1273,7 @@ parse_real (st_parameter_dt *dtp, void *buffer, in
hit_eof (dtp);
return 1;
}
- else
+ else if (c != '\n')
eat_line (dtp);
sprintf (message, "Bad floating point number for item %d",
dtp->u.p.item_count);
@@ -1310,15 +1310,22 @@ read_complex (st_parameter_dt *dtp, void * dest, i
goto bad_complex;
}
+eol_1:
eat_spaces (dtp);
+ c = next_char (dtp);
+ if (c == '\n' || c== '\r')
+ goto eol_1;
+ else
+ unget_char (dtp, c);
+
if (parse_real (dtp, dest, kind))
return;
-eol_1:
+eol_2:
eat_spaces (dtp);
c = next_char (dtp);
if (c == '\n' || c== '\r')
- goto eol_1;
+ goto eol_2;
else
unget_char (dtp, c);
@@ -1326,18 +1333,25 @@ read_complex (st_parameter_dt *dtp, void * dest, i
!= (dtp->u.p.current_unit->decimal_status == DECIMAL_POINT ? ',' : ';'))
goto bad_complex;
-eol_2:
+eol_3:
eat_spaces (dtp);
c = next_char (dtp);
if (c == '\n' || c== '\r')
- goto eol_2;
+ goto eol_3;
else
unget_char (dtp, c);
if (parse_real (dtp, dest + size / 2, kind))
return;
+
+eol_4:
+ eat_spaces (dtp);
+ c = next_char (dtp);
+ if (c == '\n' || c== '\r')
+ goto eol_4;
+ else
+ unget_char (dtp, c);
- eat_spaces (dtp);
if (next_char (dtp) != ')')
goto bad_complex;
@@ -1363,7 +1377,7 @@ read_complex (st_parameter_dt *dtp, void * dest, i
hit_eof (dtp);
return;
}
- else
+ else if (c != '\n')
eat_line (dtp);
sprintf (message, "Bad complex value in item %d of list input",
dtp->u.p.item_count);
@@ -1726,8 +1740,9 @@ read_real (st_parameter_dt *dtp, void * dest, int
hit_eof (dtp);
return;
}
- else
+ else if (c != '\n')
eat_line (dtp);
+
sprintf (message, "Bad real number in item %d of list input",
dtp->u.p.item_count);
generate_error (&dtp->common, LIBERROR_READ_VALUE, message);