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: allow for sequence streams to handle all byte arrays

Browse source 
Previously when we couldn't convert the vector element type to a character,
creating sequence streams failed even when we were expecting the binary stream.
From now on it is possible to vectors with upgraded types being any integer.
This commit is contained in:
Daniel Kochmański 2025-07-23 16:00:30 +02:00
parent ea11e2c433
commit 086f0a4bef
1 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/c/streams/strm_sequence.d
View file

@ -18,6 +18,60 @@
#define ECL_DEFINE_AET_SIZE
#include <ecl/internal.h>
/**********************************************************************
* Direct vector operations (no conversion, arbitrary element type).
*/
static cl_object
seq_read_object(cl_object strm)
{
cl_object vec = SEQ_STREAM_VECTOR(strm);
cl_fixnum pos = SEQ_STREAM_POSITION(strm);
if (pos < SEQ_INPUT_LIMIT(strm)) {
SEQ_STREAM_POSITION(strm)++;
return ecl_aref_unsafe(vec, pos);
}
return OBJNULL;
}
static cl_object
seq_peek_object(cl_object strm)
{
cl_object vec = SEQ_STREAM_VECTOR(strm);
cl_fixnum pos = SEQ_STREAM_POSITION(strm);
if (pos < SEQ_INPUT_LIMIT(strm)) {
return ecl_aref_unsafe(vec, pos);
}
return OBJNULL;
}
static void
seq_write_object(cl_object strm, cl_object object)
{
cl_object vec = SEQ_STREAM_VECTOR(strm);
cl_fixnum pos = SEQ_STREAM_POSITION(strm);
cl_fixnum dim = vec->vector.dim;
AGAIN:
if (pos >= dim) {
cl_object size = ecl_ash(ecl_make_fixnum(dim), 1);
SEQ_STREAM_VECTOR(strm) = vec = si_adjust_vector(vec, size);
goto AGAIN;
}
ecl_aset(vec, pos++, object);
if (vec->vector.fillp < pos)
vec->vector.fillp = pos;
SEQ_STREAM_POSITION(strm) = pos;
}
static void
seq_unread_object(cl_object strm, cl_object object)
{
unlikely_if (SEQ_STREAM_POSITION(strm) <= 0) {
ecl_unread_error(strm);
}
SEQ_STREAM_POSITION(strm)--;
}
/**********************************************************************
* SEQUENCE INPUT STREAMS
*/
@ -249,6 +303,13 @@ make_sequence_input_stream(cl_object vector, cl_index istart, cl_index iend,
strm->stream.ops->unread_char = seq_in_ucs4_unread_char;
}
#endif
else if(Null(external_format)) {
/* ecl_normalize_stream_element_type errors on illegal element type. */
ecl_set_stream_elt_type(strm, byte_size, flags, external_format);
strm->stream.ops->read_byte = seq_read_object;
strm->stream.ops->peek_byte = seq_peek_object;
strm->stream.ops->unread_byte = seq_unread_object;
}
else {
FEerror("Illegal combination of external-format ~A and input vector ~A for MAKE-SEQUENCE-INPUT-STREAM.~%", 2, external_format, vector);
}
@ -438,6 +499,7 @@ make_sequence_output_stream(cl_object vector, cl_object external_format)
external_format = @':default';
}
if (ecl_aet_size[type] == 1) {
/* If elements of the stream are byte8, then we can convert them on fly. */
ecl_set_stream_elt_type(strm, byte_size, flags, external_format);
/* Override byte size */
if (byte_size) strm->stream.byte_size = 8;
@ -458,6 +520,11 @@ make_sequence_output_stream(cl_object vector, cl_object external_format)
strm->stream.ops->write_char = seq_out_ucs4_write_char;
}
#endif
else if(Null(external_format)) {
/* ecl_normalize_stream_element_type errors on illegal element type. */
ecl_set_stream_elt_type(strm, byte_size, flags, external_format);
strm->stream.ops->write_byte = seq_write_object;
}
else {
FEerror("Illegal combination of external-format ~A and output vector ~A for MAKE-SEQUENCE-OUTPUT-STREAM.~%", 2, external_format, vector);
}