diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-30 01:29:32 -0800 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-30 01:29:32 -0800 |
| commit | b25711ea8fdc1588b5a69f7d0941de09b50fa28c (patch) | |
| tree | db7cd93c99583a858ef94b3dab95b882832da251 /py/objtuple.c | |
| parent | cdd2c62e07549e36dba00bc37d7ba7a4cd41ad50 (diff) | |
| parent | c1d9bbc3453454aceb28f51e72e4aeb8ef1c12eb (diff) | |
| download | micropython-b25711ea8fdc1588b5a69f7d0941de09b50fa28c.tar.gz micropython-b25711ea8fdc1588b5a69f7d0941de09b50fa28c.zip | |
Merge pull request #238 from pfalcon/bool_len
Implement __bool__ and __len__ via unary_op virtual method for all types.
Diffstat (limited to 'py/objtuple.c')
| -rw-r--r-- | py/objtuple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/py/objtuple.c b/py/objtuple.c index 754fe4b662..5f1744ea30 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -76,7 +76,8 @@ static mp_obj_t tuple_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const m static mp_obj_t tuple_unary_op(int op, mp_obj_t self_in) { mp_obj_tuple_t *self = self_in; switch (op) { - case RT_UNARY_OP_NOT: if (self->len == 0) { return mp_const_true; } else { return mp_const_false; } + case RT_UNARY_OP_BOOL: return MP_BOOL(self->len != 0); + case RT_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->len); default: return MP_OBJ_NULL; // op not supported for None } } |