diff options
Diffstat (limited to 'py/objint_longlong.c')
| -rw-r--r-- | py/objint_longlong.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/py/objint_longlong.c b/py/objint_longlong.c index 3a8d3eaa86..e64cc6734f 100644 --- a/py/objint_longlong.c +++ b/py/objint_longlong.c @@ -32,10 +32,10 @@ void int_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj mp_obj_t int_unary_op(int op, mp_obj_t o_in) { mp_obj_int_t *o = o_in; switch (op) { - case RT_UNARY_OP_BOOL: return MP_BOOL(o->val != 0); - case RT_UNARY_OP_POSITIVE: return o_in; - case RT_UNARY_OP_NEGATIVE: return mp_obj_new_int_from_ll(-o->val); - case RT_UNARY_OP_INVERT: return mp_obj_new_int_from_ll(~o->val); + case MP_UNARY_OP_BOOL: return MP_BOOL(o->val != 0); + case MP_UNARY_OP_POSITIVE: return o_in; + case MP_UNARY_OP_NEGATIVE: return mp_obj_new_int_from_ll(-o->val); + case MP_UNARY_OP_INVERT: return mp_obj_new_int_from_ll(~o->val); default: return NULL; // op not supported } } @@ -61,50 +61,50 @@ mp_obj_t int_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) { } switch (op) { - case RT_BINARY_OP_ADD: - case RT_BINARY_OP_INPLACE_ADD: + case MP_BINARY_OP_ADD: + case MP_BINARY_OP_INPLACE_ADD: return mp_obj_new_int_from_ll(lhs_val + rhs_val); - case RT_BINARY_OP_SUBTRACT: - case RT_BINARY_OP_INPLACE_SUBTRACT: + case MP_BINARY_OP_SUBTRACT: + case MP_BINARY_OP_INPLACE_SUBTRACT: return mp_obj_new_int_from_ll(lhs_val - rhs_val); - case RT_BINARY_OP_MULTIPLY: - case RT_BINARY_OP_INPLACE_MULTIPLY: + case MP_BINARY_OP_MULTIPLY: + case MP_BINARY_OP_INPLACE_MULTIPLY: return mp_obj_new_int_from_ll(lhs_val * rhs_val); - case RT_BINARY_OP_FLOOR_DIVIDE: - case RT_BINARY_OP_INPLACE_FLOOR_DIVIDE: + case MP_BINARY_OP_FLOOR_DIVIDE: + case MP_BINARY_OP_INPLACE_FLOOR_DIVIDE: return mp_obj_new_int_from_ll(lhs_val / rhs_val); - case RT_BINARY_OP_MODULO: - case RT_BINARY_OP_INPLACE_MODULO: + case MP_BINARY_OP_MODULO: + case MP_BINARY_OP_INPLACE_MODULO: return mp_obj_new_int_from_ll(lhs_val % rhs_val); - case RT_BINARY_OP_AND: - case RT_BINARY_OP_INPLACE_AND: + case MP_BINARY_OP_AND: + case MP_BINARY_OP_INPLACE_AND: return mp_obj_new_int_from_ll(lhs_val & rhs_val); - case RT_BINARY_OP_OR: - case RT_BINARY_OP_INPLACE_OR: + case MP_BINARY_OP_OR: + case MP_BINARY_OP_INPLACE_OR: return mp_obj_new_int_from_ll(lhs_val | rhs_val); - case RT_BINARY_OP_XOR: - case RT_BINARY_OP_INPLACE_XOR: + case MP_BINARY_OP_XOR: + case MP_BINARY_OP_INPLACE_XOR: return mp_obj_new_int_from_ll(lhs_val ^ rhs_val); - case RT_BINARY_OP_LSHIFT: - case RT_BINARY_OP_INPLACE_LSHIFT: + case MP_BINARY_OP_LSHIFT: + case MP_BINARY_OP_INPLACE_LSHIFT: return mp_obj_new_int_from_ll(lhs_val << (int)rhs_val); - case RT_BINARY_OP_RSHIFT: - case RT_BINARY_OP_INPLACE_RSHIFT: + case MP_BINARY_OP_RSHIFT: + case MP_BINARY_OP_INPLACE_RSHIFT: return mp_obj_new_int_from_ll(lhs_val >> (int)rhs_val); - case RT_BINARY_OP_LESS: + case MP_BINARY_OP_LESS: return MP_BOOL(lhs_val < rhs_val); - case RT_BINARY_OP_MORE: + case MP_BINARY_OP_MORE: return MP_BOOL(lhs_val > rhs_val); - case RT_BINARY_OP_LESS_EQUAL: + case MP_BINARY_OP_LESS_EQUAL: return MP_BOOL(lhs_val <= rhs_val); - case RT_BINARY_OP_MORE_EQUAL: + case MP_BINARY_OP_MORE_EQUAL: return MP_BOOL(lhs_val >= rhs_val); - case RT_BINARY_OP_EQUAL: + case MP_BINARY_OP_EQUAL: return MP_BOOL(lhs_val == rhs_val); - case RT_BINARY_OP_NOT_EQUAL: + case MP_BINARY_OP_NOT_EQUAL: return MP_BOOL(lhs_val != rhs_val); default: |