diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-02 12:22:07 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-02 12:22:07 +0100 |
commit | 660aef67c4e7b598d98b7048784065922c7ab393 (patch) | |
tree | c282a939fdd13b514767e1bc97c54e35bb06b456 /py/objint.c | |
parent | 48815668747a1d684d7fce155b5c54066a9f07e2 (diff) | |
download | micropython-660aef67c4e7b598d98b7048784065922c7ab393.tar.gz micropython-660aef67c4e7b598d98b7048784065922c7ab393.zip |
py: Allow multiple of str/list/tuple on left by an integer.
Diffstat (limited to 'py/objint.c')
-rw-r--r-- | py/objint.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/py/objint.c b/py/objint.c index 27834b81fd..3a853eab80 100644 --- a/py/objint.c +++ b/py/objint.c @@ -1,3 +1,4 @@ +#include <stdlib.h> #include <stdint.h> #include <assert.h> @@ -9,6 +10,8 @@ #include "parsenum.h" #include "mpz.h" #include "objint.h" +#include "runtime0.h" +#include "runtime.h" #if MICROPY_ENABLE_FLOAT #include <math.h> @@ -59,16 +62,20 @@ void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj } } -// This is called only for non-SMALL_INT +// This is called for operations on SMALL_INT that are not handled by mp_unary_op mp_obj_t int_unary_op(int op, mp_obj_t o_in) { - assert(0); - return mp_const_none; + return MP_OBJ_NULL; } -// This is called only for non-SMALL_INT +// This is called for operations on SMALL_INT that are not handled by mp_binary_op mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { - assert(0); - return mp_const_none; + if (op == MP_BINARY_OP_MULTIPLY) { + if (MP_OBJ_IS_STR(rhs_in) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple) || MP_OBJ_IS_TYPE(rhs_in, &mp_type_list)) { + // multiply is commutative for these types, so delegate to them + return mp_binary_op(op, rhs_in, lhs_in); + } + } + return MP_OBJ_NULL; } // This is called only with strings whose value doesn't fit in SMALL_INT |