summaryrefslogtreecommitdiff
path: root/py/objint_longlong.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-12-30 00:22:10 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-12-30 00:22:50 +0200
commit12033df511a5a5f0237a764379aacfbceb6c45dd (patch)
tree226ec32b42cfa23f51ce55e3b82a03b08e46714b /py/objint_longlong.c
parente3fa8278b45447b9e099e896bb24a84bb79e4cf0 (diff)
py: Partially fix float to int conversion.
This fixes conversion when float type has more mantissa bits than small int, and float value has small exponent. This is for example the case of 32-bit platform using doubles, and converting value of time.time(). Conversion of floats with larg exponnet is still not handled correctly.
Diffstat (limited to 'py/objint_longlong.c')
-rw-r--r--py/objint_longlong.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index ec55c7784..5f48b7134 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -40,6 +40,10 @@
#include "runtime0.h"
#include "runtime.h"
+#if MICROPY_PY_BUILTINS_FLOAT
+#include <math.h>
+#endif
+
#if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
// Python3 no longer has "l" suffix for long ints. We allow to use it
@@ -187,6 +191,14 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
return o;
}
+#if MICROPY_PY_BUILTINS_FLOAT
+mp_obj_t mp_obj_new_int_from_float(mp_float_t val) {
+ // TODO raise an exception if the unsigned long long won't fit
+ long long i = MICROPY_FLOAT_C_FUN(trunc)(val);
+ return mp_obj_new_int_from_ll(i);
+}
+#endif
+
mp_obj_t mp_obj_new_int_from_str_len(const char **str, mp_uint_t len, bool neg, mp_uint_t base) {
// TODO this does not honor the given length of the string, but it all cases it should anyway be null terminated
// TODO check overflow