1 files changed, 19 insertions, 12 deletions

diff --git a/py/objtuple.c b/py/objtuple.c
index 7685cc449f..a64b1fa16c 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -9,26 +9,21 @@
 #include "obj.h"
 #include "runtime0.h"
 #include "runtime.h"
-
-typedef struct _mp_obj_tuple_t {
-    mp_obj_base_t base;
-    machine_uint_t len;
-    mp_obj_t items[];
-} mp_obj_tuple_t;
+#include "objtuple.h"
 
 static mp_obj_t mp_obj_new_tuple_iterator(mp_obj_tuple_t *tuple, int cur);
 
 /******************************************************************************/
 /* tuple                                                                      */
 
-static void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in) {
+void tuple_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
     mp_obj_tuple_t *o = o_in;
     print(env, "(");
     for (int i = 0; i < o->len; i++) {
         if (i > 0) {
             print(env, ", ");
         }
-        mp_obj_print_helper(print, env, o->items[i]);
+        mp_obj_print_helper(print, env, o->items[i], PRINT_REPR);
     }
     if (o->len == 1) {
         print(env, ",");
@@ -116,8 +111,10 @@ mp_obj_t mp_obj_new_tuple(uint n, const mp_obj_t *items) {
     mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
     o->base.type = &tuple_type;
     o->len = n;
-    for (int i = 0; i < n; i++) {
-        o->items[i] = items[i];
+    if (items) {
+        for (int i = 0; i < n; i++) {
+            o->items[i] = items[i];
+        }
     }
     return o;
 }
@@ -138,8 +135,18 @@ mp_obj_t mp_obj_new_tuple_reverse(uint n, const mp_obj_t *items) {
 void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
     assert(MP_OBJ_IS_TYPE(self_in, &tuple_type));
     mp_obj_tuple_t *self = self_in;
-    *len = self->len;
-    *items = &self->items[0];
+    if (len) {
+        *len = self->len;
+    }
+    if (items) {
+        *items = &self->items[0];
+    }
+}
+
+void mp_obj_tuple_del(mp_obj_t self_in) {
+    assert(MP_OBJ_IS_TYPE(self_in, &tuple_type));
+    mp_obj_tuple_t *self = self_in;
+    m_del_var(mp_obj_tuple_t, mp_obj_t, self->len, self);
 }
 
 /******************************************************************************/