diff options
author | Damien George <damien.p.george@gmail.com> | 2014-05-10 13:55:11 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-05-10 13:55:11 +0100 |
commit | d0a5bf34f746276550aef9c8519160c033611571 (patch) | |
tree | 2c24601b11eeb11f161082a92b89eb559702cc4e /py/objtuple.c | |
parent | 2bb179e1248f045525b247981e3e5285800b63d6 (diff) |
py: Tidy up returning NULL which should be MP_OBJ_NOT_SUPPORTED.
Diffstat (limited to 'py/objtuple.c')
-rw-r--r-- | py/objtuple.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/py/objtuple.c b/py/objtuple.c index 9434b418c..bb0ce6586 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -121,20 +121,18 @@ mp_obj_t tuple_unary_op(int op, mp_obj_t self_in) { mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { mp_obj_tuple_t *o = lhs; switch (op) { - case MP_BINARY_OP_ADD: - { + case MP_BINARY_OP_ADD: { if (!mp_obj_is_subclass_fast(mp_obj_get_type(rhs), (mp_obj_t)&mp_type_tuple)) { - return NULL; + return MP_OBJ_NOT_SUPPORTED; } mp_obj_tuple_t *p = rhs; mp_obj_tuple_t *s = mp_obj_new_tuple(o->len + p->len, NULL); m_seq_cat(s->items, o->items, o->len, p->items, p->len, mp_obj_t); return s; } - case MP_BINARY_OP_MULTIPLY: - { + case MP_BINARY_OP_MULTIPLY: { if (!MP_OBJ_IS_SMALL_INT(rhs)) { - return NULL; + return MP_OBJ_NOT_SUPPORTED; } int n = MP_OBJ_SMALL_INT_VALUE(rhs); mp_obj_tuple_t *s = mp_obj_new_tuple(o->len * n, NULL); @@ -150,7 +148,7 @@ mp_obj_t tuple_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) { default: // op not supported - return NULL; + return MP_OBJ_NOT_SUPPORTED; } } |