mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2025-12-06 02:40:26 -08:00
Code Issues Projects Releases Packages Wiki Activity

streams: move ecl_generic_unread_byte to ecl_binary_unread_byte

Browse source
This commit is contained in:
Daniel Kochmański 2025-07-25 22:22:49 +02:00
parent ca845457f8
commit 31a3fc904e
4 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/c/streams/strm_binary.d
View file

@ -48,6 +48,18 @@ ecl_binary_write_byte(cl_object strm, cl_object byte)
write_byte8(strm, buf, nbytes);
}
/* FIXME this function should spill octets into the buffer like eformat does, so
that when we read-char next, or change the element type and re-read byte, it
will be possible to reinterpret these octets. */
void
ecl_binary_unread_byte(cl_object strm, cl_object byte)
{
unlikely_if (strm->stream.last_byte != OBJNULL) {
ecl_unread_twice(strm);
}
strm->stream.last_byte = byte;
}
/*
* 8-bit unsigned
*/

6
src/c/streams/strm_common.d
View file

@ -322,12 +322,6 @@ closed_stream_set_position(cl_object strm, cl_object position)
* Versions of the methods which are defined in terms of others
*/
void
ecl_generic_unread_byte(cl_object strm, cl_object byte)
{
strm->stream.last_byte = byte;
}
cl_object
ecl_generic_peek_byte(cl_object strm)
{

14
src/c/streams/strm_os.d
View file

@ -563,7 +563,7 @@ const struct ecl_file_ops io_file_ops = {
ecl_binary_read_byte,
ecl_binary_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -643,7 +643,7 @@ const struct ecl_file_ops input_file_ops = {
ecl_binary_read_byte,
ecl_not_output_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -951,7 +951,7 @@ const struct ecl_file_ops io_stream_ops = {
ecl_binary_read_byte,
ecl_binary_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -1031,7 +1031,7 @@ const struct ecl_file_ops input_stream_ops = {
ecl_binary_read_byte,
ecl_not_output_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -1182,7 +1182,7 @@ const struct ecl_file_ops winsock_stream_io_ops = {
ecl_binary_read_byte,
ecl_binary_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -1262,7 +1262,7 @@ const struct ecl_file_ops winsock_stream_input_ops = {
ecl_binary_read_byte,
ecl_not_output_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,
@ -1373,7 +1373,7 @@ const struct ecl_file_ops wcon_stream_io_ops = {
ecl_binary_read_byte,
ecl_binary_write_byte,
ecl_generic_unread_byte,
ecl_binary_unread_byte,
ecl_generic_peek_byte,
ecl_eformat_read_char,

2
src/h/internal.h
View file

@ -442,7 +442,6 @@ cl_object ecl_not_output_string_length(cl_object strm, cl_object string);
cl_object ecl_not_file_string_length(cl_object strm, cl_object string);
int ecl_unknown_column(cl_object strm);
void ecl_generic_unread_byte(cl_object strm, cl_object byte);
cl_object ecl_generic_peek_byte(cl_object strm);
ecl_character ecl_generic_peek_char(cl_object strm);
void ecl_generic_void(cl_object strm);
@ -458,6 +457,7 @@ cl_index ecl_generic_read_vector(cl_object strm, cl_object data, cl_index start,
/* streams/strm_binary.d */
cl_object ecl_binary_read_byte(cl_object strm);
void ecl_binary_write_byte(cl_object c, cl_object strm);
void ecl_binary_unread_byte(cl_object strm, cl_object byte);
cl_object ecl_binary_u8_decoder(cl_object strm, unsigned char *buf);
void ecl_binary_u8_encoder(cl_object strm, unsigned char *buf, cl_object byte);