commit d5f5b2f76698e29f9cc2f0ae682d2475c0d77baa
author Damien George <damien.p.george@gmail.com> Sat May 03 22:01:32 2014 +0100
committer Damien George <damien.p.george@gmail.com> Sat May 03 22:01:32 2014 +0100
tree 5e1981a9f39935586e4c5310d1d0c0e3853c6887
parent 5320bff32c2bb97f36dc9fad62864183520d0327

py, stream: Implement readlines for a stream.

py/qstrdefs.h

diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 6960bd0..bcaed02 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -314,6 +314,7 @@
 Q(io)
 Q(readall)
 Q(readline)
+Q(readlines)
 Q(StringIO)
 Q(BytesIO)
 Q(getvalue)

py/stream.c

diff --git a/py/stream.c b/py/stream.c
index 113eaa4..f20ee0f 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -123,8 +123,7 @@
     while (max_size == -1 || max_size-- != 0) {
         char *p = vstr_add_len(vstr, 1);
         if (p == NULL) {
-            // TODO
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError/*&mp_type_RuntimeError*/, "Out of memory"));
+            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_MemoryError, "out of memory"));
         }
 
         machine_int_t out_sz = o->type->stream_p->read(o, p, 1, &error);
@@ -143,16 +142,29 @@
             break;
         }
     }
-    // TODO don't intern this string
-    vstr_shrink(vstr);
-    return MP_OBJ_NEW_QSTR(qstr_from_strn_take(vstr_str(vstr), vstr->alloc, vstr_len(vstr)));
+    // TODO need a string creation API that doesn't copy the given data
+    mp_obj_t ret = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
+    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);
+        if (mp_obj_str_get_len(line) == 0) {
+            break;
+        }
+        mp_obj_list_append(lines, line);
+    }
+    return lines;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_stream_unbuffered_readlines_obj, stream_unbuffered_readlines);
+
 mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) {
     mp_obj_t l_in = stream_unbuffered_readline(1, &self);
-    uint sz;
-    mp_obj_str_get_data(l_in, &sz);
-    if (sz != 0) {
+    if (mp_obj_str_get_len(l_in) != 0) {
         return l_in;
     }
     return MP_OBJ_STOP_ITERATION;

py/stream.h

diff --git a/py/stream.h b/py/stream.h
index a0cc347..cb70a3d 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -1,7 +1,8 @@
-extern const mp_obj_fun_native_t mp_stream_read_obj;
-extern const mp_obj_fun_native_t mp_stream_readall_obj;
-extern const mp_obj_fun_native_t mp_stream_unbuffered_readline_obj;
-extern const mp_obj_fun_native_t mp_stream_write_obj;
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_read_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_readall_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_unbuffered_readline_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_unbuffered_readlines_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_stream_write_obj);
 
 // Iterator which uses mp_stream_unbuffered_readline_obj
 mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self);