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

READ-LINE did not support Gray streams

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2008-12-10 12:13:29 +01:00
parent 38ef5fad47
commit a25d20a3cb
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CHANGELOG
View file

@ -198,7 +198,7 @@ ECL 8.9.0:
- Hash tables were not properly serialized.
- WRITE-LINE did not work with gray streams (A. Vodonosov)
- WRITE/READ-LINE did not work with gray streams (A. Vodonosov)
- When working with Gray streams, READ-LINE did not handle the EOF properly.

11
src/c/read.d
View file

@ -1522,13 +1522,12 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
strm = stream_or_default_input(strm);
#ifdef ECL_CLOS_STREAMS
if (type_of(strm) != t_stream) {
cl_object out = funcall(2, @'gray::stream-read-line', strm);
token = funcall(2, @'gray::stream-read-line', strm);
if (!Null(VALUES(1))) {
if (!Null(eof_errorp))
FEend_of_file(strm);
out = eof_value;
c = EOF;
goto EOFCHK;
}
return out;
return token;
}
#endif
token = si_get_buffer_string();
@ -1538,7 +1537,7 @@ do_read_delimited_list(int d, cl_object in, bool proper_list)
break;
ecl_string_push_extend(token, c);
} while(1);
if (c == EOF && token->base_string.fillp == 0) {
EOFCHK: if (c == EOF && token->base_string.fillp == 0) {
if (!Null(eof_errorp))
FEend_of_file(strm);
value0 = eof_value;