TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/objint_longlong: Fix longlong interoperability with floats.

Browse Source 
Current longlong implementation does not allow a float as RHS of mathematic
operators, as it lacks the delegation code present in mpz.

Signed-off-by: Yoctopuce dev <dev@yoctopuce.com>
This commit is contained in:
Yoctopuce dev
2025-07-20 16:38:33 +02:00
committed by Damien George
parent 3c69277ba9
commit 3a72f95919
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
py/objint_longlong.c
View File

@@ -165,11 +165,28 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
rhs_val = MP_OBJ_SMALL_INT_VALUE(rhs_in); rhs_val = MP_OBJ_SMALL_INT_VALUE(rhs_in);
} else if (mp_obj_is_exact_type(rhs_in, &mp_type_int)) { } else if (mp_obj_is_exact_type(rhs_in, &mp_type_int)) {
rhs_val = ((mp_obj_int_t *)rhs_in)->val; rhs_val = ((mp_obj_int_t *)rhs_in)->val;
#if MICROPY_PY_BUILTINS_FLOAT
} else if (mp_obj_is_float(rhs_in)) {
return mp_obj_float_binary_op(op, (mp_float_t)lhs_val, rhs_in);
#endif
#if MICROPY_PY_BUILTINS_COMPLEX
} else if (mp_obj_is_type(rhs_in, &mp_type_complex)) {
return mp_obj_complex_binary_op(op, (mp_float_t)lhs_val, 0, rhs_in);
#endif
} else { } else {
// delegate to generic function to check for extra cases // delegate to generic function to check for extra cases
return mp_obj_int_binary_op_extra_cases(op, lhs_in, rhs_in); return mp_obj_int_binary_op_extra_cases(op, lhs_in, rhs_in);
} }
#if MICROPY_PY_BUILTINS_FLOAT
if (op == MP_BINARY_OP_TRUE_DIVIDE || op == MP_BINARY_OP_INPLACE_TRUE_DIVIDE) {
if (rhs_val == 0) {
goto zero_division;
}
return mp_obj_new_float((mp_float_t)lhs_val / (mp_float_t)rhs_val);
}
#endif
switch (op) { switch (op) {
case MP_BINARY_OP_ADD: case MP_BINARY_OP_ADD:
case MP_BINARY_OP_INPLACE_ADD: case MP_BINARY_OP_INPLACE_ADD:

25
tests/float/int_64_float.py Normal file
View File

@@ -0,0 +1,25 @@
# test int64 operation with float/complex
i = 1 << 40
# convert int64 to float on rhs
print("%.5g" % (2.0 * i))
# negative int64 as float
print("%.5g" % float(-i))
# this should convert to float
print("%.5g" % (i / 5))
# these should delegate to float
print("%.5g" % (i * 1.2))
print("%.5g" % (i / 1.2))
# negative power should produce float
print("%.5g" % (i**-1))
print("%.5g" % ((2 + i - i) ** -3))
try:
i / 0
except ZeroDivisionError:
print("ZeroDivisionError")