mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-14 13:21:54 -08:00
Code Issues Projects Releases Packages Wiki Activity

In reading functions, the value of :RECURSIVE-P should not interfere with that of :EOF-ERROR-P

Browse source
This commit is contained in:
jjgarcia 2008-08-24 13:35:01 +00:00
parent 1f20a4a62f
commit 2c4e4afaf4
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGELOG
View file

@ -60,6 +60,9 @@ ECL 0.9l-p1:
> (si::load-foreign-module "/usr/lib/libm.dylib")
#<codeblock "libm.dylib">
- In reading functions, the value of :RECURSIVE-P should not interfere with
that of :EOF-ERROR-P
;;; Local Variables: ***
;;; mode:text ***
;;; fill-column:79 ***

6
src/c/read.d
View file

@ -1526,7 +1526,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
ecl_string_push_extend(token, c);
} while(1);
if (c == EOF && token->base_string.fillp == 0) {
if (!Null(eof_errorp) || !Null(recursivep))
if (!Null(eof_errorp))
FEend_of_file(strm);
value0 = eof_value;
value1 = Ct;
@ -1554,7 +1554,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
c = ecl_read_char(strm);
if (c != EOF)
output = CODE_CHAR(c);
else if (Null(eof_errorp) && Null(recursivep))
else if (Null(eof_errorp))
output = eof_value;
else
FEend_of_file(strm);
@ -1636,7 +1636,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
}
/* We reach here if there was an EOF */
END_OF_FILE:
if (Null(eof_errorp) && Null(recursivep))
if (Null(eof_errorp))
@(return eof_value)
else
FEend_of_file(strm);