2014-05-03 18:27:38 -04:00
|
|
|
/*
|
|
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
|
|
*
|
|
|
|
* The MIT License (MIT)
|
|
|
|
*
|
|
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
2014-05-13 01:44:45 -04:00
|
|
|
* Copyright (c) 2014 Paul Sokolovsky
|
2014-05-03 18:27:38 -04:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2014-04-12 11:44:32 -04:00
|
|
|
#include <string.h>
|
2014-01-07 19:43:48 -05:00
|
|
|
|
2014-05-02 10:47:01 -04:00
|
|
|
#include "mpconfig.h"
|
2014-01-07 19:43:48 -05:00
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
2014-01-21 16:40:13 -05:00
|
|
|
#include "qstr.h"
|
2014-01-07 19:43:48 -05:00
|
|
|
#include "obj.h"
|
2014-05-15 00:28:19 -04:00
|
|
|
#include "objstr.h"
|
2014-06-15 16:23:36 -04:00
|
|
|
#include "runtime.h"
|
2014-01-07 19:43:48 -05:00
|
|
|
#include "stream.h"
|
2014-05-06 19:23:46 -04:00
|
|
|
#if MICROPY_STREAMS_NON_BLOCK
|
|
|
|
#include <errno.h>
|
2014-06-28 15:04:20 -04:00
|
|
|
#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
|
|
|
|
#define EWOULDBLOCK 140
|
|
|
|
#endif
|
2014-05-06 19:23:46 -04:00
|
|
|
#endif
|
2014-01-07 19:43:48 -05:00
|
|
|
|
|
|
|
// This file defines generic Python stream read/write methods which
|
|
|
|
// dispatch to the underlying stream interface of an object.
|
|
|
|
|
2014-05-06 18:51:07 -04:00
|
|
|
// TODO: should be in mpconfig.h
|
|
|
|
#define DEFAULT_BUFFER_SIZE 256
|
|
|
|
|
2014-02-12 11:31:30 -05:00
|
|
|
STATIC mp_obj_t stream_readall(mp_obj_t self_in);
|
2014-01-16 05:53:46 -05:00
|
|
|
|
2014-05-06 19:23:46 -04:00
|
|
|
#if MICROPY_STREAMS_NON_BLOCK
|
2014-05-06 18:39:38 -04:00
|
|
|
// TODO: This is POSIX-specific (but then POSIX is the only real thing,
|
|
|
|
// and anything else just emulates it, right?)
|
|
|
|
#define is_nonblocking_error(errno) ((errno) == EAGAIN || (errno) == EWOULDBLOCK)
|
2014-05-06 19:23:46 -04:00
|
|
|
#else
|
|
|
|
#define is_nonblocking_error(errno) (0)
|
|
|
|
#endif
|
2014-05-06 18:39:38 -04:00
|
|
|
|
2014-07-27 17:38:58 -04:00
|
|
|
#define STREAM_CONTENT_TYPE(stream) (((stream)->is_text) ? &mp_type_str : &mp_type_bytes)
|
2014-05-15 00:28:19 -04:00
|
|
|
|
2014-10-24 07:26:12 -04:00
|
|
|
STATIC mp_obj_t stream_read(mp_uint_t n_args, const mp_obj_t *args) {
|
2014-01-16 05:53:46 -05:00
|
|
|
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0];
|
2014-04-05 18:02:23 -04:00
|
|
|
if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
|
2014-01-07 19:43:48 -05:00
|
|
|
// CPython: io.UnsupportedOperation, OSError subclass
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
|
2014-01-07 19:43:48 -05:00
|
|
|
}
|
|
|
|
|
2014-07-16 06:45:10 -04:00
|
|
|
// What to do if sz < -1? Python docs don't specify this case.
|
|
|
|
// CPython does a readall, but here we silently let negatives through,
|
|
|
|
// and they will cause a MemoryError.
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t sz;
|
2014-01-16 05:53:46 -05:00
|
|
|
if (n_args == 1 || ((sz = mp_obj_get_int(args[1])) == -1)) {
|
|
|
|
return stream_readall(args[0]);
|
|
|
|
}
|
2014-06-15 16:23:36 -04:00
|
|
|
|
|
|
|
#if MICROPY_PY_BUILTINS_STR_UNICODE
|
2014-07-27 17:38:58 -04:00
|
|
|
if (o->type->stream_p->is_text) {
|
2014-07-16 06:45:10 -04:00
|
|
|
// We need to read sz number of unicode characters. Because we don't have any
|
|
|
|
// buffering, and because the stream API can only read bytes, we must read here
|
|
|
|
// in units of bytes and must never over read. If we want sz chars, then reading
|
|
|
|
// sz bytes will never over-read, so we follow this approach, in a loop to keep
|
|
|
|
// reading until we have exactly enough chars. This will be 1 read for text
|
|
|
|
// with ASCII-only chars, and about 2 reads for text with a couple of non-ASCII
|
|
|
|
// chars. For text with lots of non-ASCII chars, it'll be pretty inefficient
|
|
|
|
// in time and memory.
|
|
|
|
|
|
|
|
vstr_t vstr;
|
|
|
|
vstr_init(&vstr, sz);
|
|
|
|
mp_uint_t more_bytes = sz;
|
|
|
|
mp_uint_t last_buf_offset = 0;
|
|
|
|
while (more_bytes > 0) {
|
|
|
|
char *p = vstr_add_len(&vstr, more_bytes);
|
|
|
|
if (p == NULL) {
|
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory"));
|
|
|
|
}
|
|
|
|
int error;
|
2014-07-27 17:38:58 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->read(o, p, more_bytes, &error);
|
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
2014-07-16 06:45:10 -04:00
|
|
|
vstr_cut_tail_bytes(&vstr, more_bytes);
|
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
// With non-blocking streams, we read as much as we can.
|
|
|
|
// If we read nothing, return None, just like read().
|
|
|
|
// Otherwise, return data read so far.
|
|
|
|
// TODO what if we have read only half a non-ASCII char?
|
|
|
|
if (vstr.len == 0) {
|
|
|
|
vstr_clear(&vstr);
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-10-15 19:56:24 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
2014-07-16 06:45:10 -04:00
|
|
|
}
|
|
|
|
|
2014-07-27 17:38:58 -04:00
|
|
|
if (out_sz < more_bytes) {
|
2014-07-16 06:45:10 -04:00
|
|
|
// Finish reading.
|
|
|
|
// TODO what if we have read only half a non-ASCII char?
|
2014-07-21 19:51:07 -04:00
|
|
|
vstr_cut_tail_bytes(&vstr, more_bytes - out_sz);
|
|
|
|
if (out_sz == 0) {
|
|
|
|
break;
|
|
|
|
}
|
2014-07-16 06:45:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// count chars from bytes just read
|
|
|
|
for (mp_uint_t off = last_buf_offset;;) {
|
|
|
|
byte b = vstr.buf[off];
|
|
|
|
int n;
|
|
|
|
if (!UTF8_IS_NONASCII(b)) {
|
|
|
|
// 1-byte ASCII char
|
|
|
|
n = 1;
|
|
|
|
} else if ((b & 0xe0) == 0xc0) {
|
|
|
|
// 2-byte char
|
|
|
|
n = 2;
|
|
|
|
} else if ((b & 0xf0) == 0xe0) {
|
|
|
|
// 3-byte char
|
|
|
|
n = 3;
|
|
|
|
} else if ((b & 0xf8) == 0xf0) {
|
|
|
|
// 4-byte char
|
|
|
|
n = 4;
|
|
|
|
} else {
|
|
|
|
// TODO
|
|
|
|
n = 5;
|
|
|
|
}
|
|
|
|
if (off + n <= vstr.len) {
|
|
|
|
// got a whole char in n bytes
|
|
|
|
off += n;
|
|
|
|
sz -= 1;
|
|
|
|
last_buf_offset = off;
|
|
|
|
if (off >= vstr.len) {
|
|
|
|
more_bytes = sz;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// didn't get a whole char, so work out how many extra bytes are needed for
|
|
|
|
// this partial char, plus bytes for additional chars that we want
|
|
|
|
more_bytes = (off + n - vstr.len) + (sz - 1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t ret = mp_obj_new_str_of_type(&mp_type_str, (byte*)vstr.buf, vstr.len);
|
|
|
|
vstr_clear(&vstr);
|
|
|
|
return ret;
|
2014-06-15 16:23:36 -04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-10-17 18:34:06 -04:00
|
|
|
byte *buf;
|
|
|
|
mp_obj_t ret_obj = mp_obj_str_builder_start(STREAM_CONTENT_TYPE(o->type->stream_p), sz, &buf);
|
2014-01-07 19:43:48 -05:00
|
|
|
int error;
|
2014-07-27 17:38:58 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->read(o, buf, sz, &error);
|
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
2014-05-06 18:39:38 -04:00
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
// https://docs.python.org/3.4/library/io.html#io.RawIOBase.read
|
|
|
|
// "If the object is in non-blocking mode and no bytes are available,
|
|
|
|
// None is returned."
|
|
|
|
// This is actually very weird, as naive truth check will treat
|
|
|
|
// this as EOF.
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-10-15 19:56:24 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
2014-01-07 19:43:48 -05:00
|
|
|
} else {
|
2014-10-17 18:34:06 -04:00
|
|
|
return mp_obj_str_builder_end_with_len(ret_obj, out_sz);
|
2014-01-07 19:43:48 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-13 16:04:17 -04:00
|
|
|
mp_obj_t mp_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t len) {
|
2014-01-07 19:43:48 -05:00
|
|
|
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in;
|
2014-04-05 18:02:23 -04:00
|
|
|
if (o->type->stream_p == NULL || o->type->stream_p->write == NULL) {
|
2014-01-07 19:43:48 -05:00
|
|
|
// CPython: io.UnsupportedOperation, OSError subclass
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
|
2014-01-07 19:43:48 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
int error;
|
2014-07-27 17:38:58 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->write(self_in, buf, len, &error);
|
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
2014-05-06 18:39:38 -04:00
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
// http://docs.python.org/3/library/io.html#io.RawIOBase.write
|
|
|
|
// "None is returned if the raw stream is set not to block and
|
|
|
|
// no single byte could be readily written to it."
|
|
|
|
// This is for consistency with read() behavior, still weird,
|
|
|
|
// see abobe.
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
2014-10-15 19:56:24 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
2014-01-07 19:43:48 -05:00
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(out_sz);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-13 16:04:17 -04:00
|
|
|
STATIC mp_obj_t stream_write_method(mp_obj_t self_in, mp_obj_t arg) {
|
|
|
|
mp_buffer_info_t bufinfo;
|
|
|
|
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
|
|
|
|
return mp_stream_write(self_in, bufinfo.buf, bufinfo.len);
|
|
|
|
}
|
|
|
|
|
2014-10-24 07:26:12 -04:00
|
|
|
STATIC mp_obj_t stream_readinto(mp_uint_t n_args, const mp_obj_t *args) {
|
2014-10-23 14:22:08 -04:00
|
|
|
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0];
|
2014-10-18 15:44:07 -04:00
|
|
|
if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
|
|
|
|
// CPython: io.UnsupportedOperation, OSError subclass
|
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
|
|
|
|
}
|
|
|
|
mp_buffer_info_t bufinfo;
|
2014-10-23 14:22:08 -04:00
|
|
|
mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
|
|
|
|
|
|
|
|
// CPython extension: if 2nd arg is provided, that's max len to read,
|
|
|
|
// instead of full buffer. Similar to
|
|
|
|
// https://docs.python.org/3/library/socket.html#socket.socket.recv_into
|
|
|
|
mp_uint_t len = bufinfo.len;
|
|
|
|
if (n_args > 2) {
|
|
|
|
len = mp_obj_int_get(args[2]);
|
|
|
|
if (len > bufinfo.len) {
|
|
|
|
len = bufinfo.len;
|
|
|
|
}
|
|
|
|
}
|
2014-10-18 15:44:07 -04:00
|
|
|
|
|
|
|
int error;
|
2014-10-23 14:22:08 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->read(o, bufinfo.buf, len, &error);
|
2014-10-18 15:44:07 -04:00
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
|
|
|
} else {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(out_sz);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:31:30 -05:00
|
|
|
STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
|
2014-01-13 16:25:33 -05:00
|
|
|
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in;
|
2014-04-05 18:02:23 -04:00
|
|
|
if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
|
2014-01-13 16:25:33 -05:00
|
|
|
// CPython: io.UnsupportedOperation, OSError subclass
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
|
2014-01-13 16:25:33 -05:00
|
|
|
}
|
|
|
|
|
2014-10-24 07:26:12 -04:00
|
|
|
mp_uint_t total_size = 0;
|
2014-05-06 18:51:07 -04:00
|
|
|
vstr_t *vstr = vstr_new_size(DEFAULT_BUFFER_SIZE);
|
2014-08-22 13:30:02 -04:00
|
|
|
char *p = vstr_str(vstr);
|
2014-10-24 07:26:12 -04:00
|
|
|
mp_uint_t current_read = DEFAULT_BUFFER_SIZE;
|
2014-01-13 16:25:33 -05:00
|
|
|
while (true) {
|
2014-10-24 07:26:12 -04:00
|
|
|
int error;
|
2014-07-27 17:38:58 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error);
|
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
2014-05-06 18:48:12 -04:00
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
// With non-blocking streams, we read as much as we can.
|
|
|
|
// If we read nothing, return None, just like read().
|
|
|
|
// Otherwise, return data read so far.
|
|
|
|
if (total_size == 0) {
|
|
|
|
return mp_const_none;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2014-10-15 19:56:24 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
2014-01-13 16:25:33 -05:00
|
|
|
}
|
|
|
|
if (out_sz == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
total_size += out_sz;
|
|
|
|
if (out_sz < current_read) {
|
|
|
|
current_read -= out_sz;
|
|
|
|
p += out_sz;
|
|
|
|
} else {
|
2014-05-06 18:51:07 -04:00
|
|
|
current_read = DEFAULT_BUFFER_SIZE;
|
2014-01-13 16:25:33 -05:00
|
|
|
p = vstr_extend(vstr, current_read);
|
|
|
|
if (p == NULL) {
|
|
|
|
// TODO
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError/*&mp_type_RuntimeError*/, "Out of memory"));
|
2014-01-13 16:25:33 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2014-05-25 17:34:34 -04:00
|
|
|
mp_obj_t s = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), (byte*)vstr->buf, total_size);
|
2014-01-22 09:35:10 -05:00
|
|
|
vstr_free(vstr);
|
|
|
|
return s;
|
2014-01-13 16:25:33 -05:00
|
|
|
}
|
|
|
|
|
2014-01-15 16:39:44 -05:00
|
|
|
// Unbuffered, inefficient implementation of readline() for raw I/O files.
|
2014-10-24 07:26:12 -04:00
|
|
|
STATIC mp_obj_t stream_unbuffered_readline(mp_uint_t n_args, const mp_obj_t *args) {
|
2014-01-15 16:39:44 -05:00
|
|
|
struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)args[0];
|
2014-04-05 18:02:23 -04:00
|
|
|
if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) {
|
2014-01-15 16:39:44 -05:00
|
|
|
// CPython: io.UnsupportedOperation, OSError subclass
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Operation not supported"));
|
2014-01-15 16:39:44 -05:00
|
|
|
}
|
|
|
|
|
2014-07-03 08:25:24 -04:00
|
|
|
mp_int_t max_size = -1;
|
2014-01-15 16:39:44 -05:00
|
|
|
if (n_args > 1) {
|
|
|
|
max_size = MP_OBJ_SMALL_INT_VALUE(args[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
vstr_t *vstr;
|
|
|
|
if (max_size != -1) {
|
2014-01-21 16:40:13 -05:00
|
|
|
vstr = vstr_new_size(max_size);
|
2014-01-15 16:39:44 -05:00
|
|
|
} else {
|
|
|
|
vstr = vstr_new();
|
|
|
|
}
|
|
|
|
|
|
|
|
while (max_size == -1 || max_size-- != 0) {
|
|
|
|
char *p = vstr_add_len(vstr, 1);
|
|
|
|
if (p == NULL) {
|
2014-05-03 17:01:32 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory"));
|
2014-01-15 16:39:44 -05:00
|
|
|
}
|
|
|
|
|
2014-10-24 07:26:12 -04:00
|
|
|
int error;
|
2014-07-27 17:38:58 -04:00
|
|
|
mp_uint_t out_sz = o->type->stream_p->read(o, p, 1, &error);
|
|
|
|
if (out_sz == MP_STREAM_ERROR) {
|
2014-10-16 05:22:52 -04:00
|
|
|
if (is_nonblocking_error(error)) {
|
|
|
|
if (vstr->len == 1) {
|
|
|
|
// We just incremented it, but otherwise we read nothing
|
|
|
|
// and immediately got EAGAIN. This is case is not well
|
|
|
|
// specified in
|
|
|
|
// https://docs.python.org/3/library/io.html#io.IOBase.readline
|
|
|
|
// unlike similar case for read(). But we follow the latter's
|
|
|
|
// behavior - return None.
|
|
|
|
vstr_free(vstr);
|
|
|
|
return mp_const_none;
|
|
|
|
} else {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
2014-10-15 19:56:24 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
|
2014-01-15 16:39:44 -05:00
|
|
|
}
|
2014-01-22 03:34:45 -05:00
|
|
|
if (out_sz == 0) {
|
2014-10-16 05:22:52 -04:00
|
|
|
done:
|
2014-01-22 03:34:45 -05:00
|
|
|
// Back out previously added byte
|
|
|
|
// Consider, what's better - read a char and get OutOfMemory (so read
|
|
|
|
// char is lost), or allocate first as we do.
|
2014-07-27 17:38:58 -04:00
|
|
|
vstr_cut_tail_bytes(vstr, 1);
|
2014-01-22 03:34:45 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*p == '\n') {
|
2014-01-15 16:39:44 -05:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-05-03 17:01:32 -04:00
|
|
|
// TODO need a string creation API that doesn't copy the given data
|
2014-05-25 17:34:34 -04:00
|
|
|
mp_obj_t ret = mp_obj_new_str_of_type(STREAM_CONTENT_TYPE(o->type->stream_p), (byte*)vstr->buf, vstr->len);
|
2014-05-03 17:01:32 -04:00
|
|
|
vstr_free(vstr);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO take an optional extra argument (what does it do exactly?)
|
|
|
|
STATIC mp_obj_t stream_unbuffered_readlines(mp_obj_t self) {
|
|
|
|
mp_obj_t lines = mp_obj_new_list(0, NULL);
|
|
|
|
for (;;) {
|
|
|
|
mp_obj_t line = stream_unbuffered_readline(1, &self);
|
2014-06-13 16:46:21 -04:00
|
|
|
if (!mp_obj_is_true(line)) {
|
2014-05-03 17:01:32 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
mp_obj_list_append(lines, line);
|
|
|
|
}
|
|
|
|
return lines;
|
2014-01-15 16:39:44 -05:00
|
|
|
}
|
2014-05-03 17:01:32 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj, stream_unbuffered_readlines);
|
2014-01-15 16:39:44 -05:00
|
|
|
|
2014-01-20 11:35:32 -05:00
|
|
|
mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) {
|
|
|
|
mp_obj_t l_in = stream_unbuffered_readline(1, &self);
|
2014-06-13 16:46:21 -04:00
|
|
|
if (mp_obj_is_true(l_in)) {
|
2014-01-20 11:35:32 -05:00
|
|
|
return l_in;
|
|
|
|
}
|
2014-04-17 18:19:36 -04:00
|
|
|
return MP_OBJ_STOP_ITERATION;
|
2014-01-20 11:35:32 -05:00
|
|
|
}
|
2014-01-15 16:39:44 -05:00
|
|
|
|
2014-01-16 05:53:46 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_read_obj, 1, 2, stream_read);
|
2014-10-23 14:22:08 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_readinto_obj, 2, 3, stream_readinto);
|
2014-01-13 16:25:33 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_readall_obj, stream_readall);
|
2014-01-15 16:39:44 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj, 1, 2, stream_unbuffered_readline);
|
2014-07-13 16:04:17 -04:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_2(mp_stream_write_obj, stream_write_method);
|