From c1d9bbc3453454aceb28f51e72e4aeb8ef1c12eb Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 30 Jan 2014 04:37:19 +0200 Subject: Implement __bool__ and __len__ via unary_op virtual method for all types. __bool__() and __len__() are just the same as __neg__() or __invert__(), and require efficient dispatching implementation (not requiring search/lookup). type->unary_op() is just the right choice for this short of adding standalone virtual method(s) to already big mp_obj_type_t structure. --- py/objcomplex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'py/objcomplex.c') diff --git a/py/objcomplex.c b/py/objcomplex.c index 24762e8b1..5b4df0da6 100644 --- a/py/objcomplex.c +++ b/py/objcomplex.c @@ -73,7 +73,7 @@ static mp_obj_t complex_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const static mp_obj_t complex_unary_op(int op, mp_obj_t o_in) { mp_obj_complex_t *o = o_in; switch (op) { - case RT_UNARY_OP_NOT: if (o->real != 0 || o->imag != 0) { return mp_const_true;} else { return mp_const_false; } + case RT_UNARY_OP_BOOL: return MP_BOOL(o->real != 0 || o->imag != 0); case RT_UNARY_OP_POSITIVE: return o_in; case RT_UNARY_OP_NEGATIVE: return mp_obj_new_complex(-o->real, -o->imag); default: return MP_OBJ_NULL; // op not supported -- cgit v1.2.3