Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
e6a4ab4b
Commit
e6a4ab4b
authored
Jan 22, 2014
by
Damien George
Browse files
py: Remove implicit conversion of float to int in mp_obj_get_int().
Addresses Issue #199.
parent
2843b8e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
py/obj.c
View file @
e6a4ab4b
...
...
@@ -177,11 +177,6 @@ machine_int_t mp_obj_get_int(mp_obj_t arg) {
return
MP_OBJ_SMALL_INT_VALUE
(
arg
);
}
else
if
(
MP_OBJ_IS_TYPE
(
arg
,
&
int_type
))
{
return
mp_obj_int_get_checked
(
arg
);
#if MICROPY_ENABLE_FLOAT
}
else
if
(
MP_OBJ_IS_TYPE
(
arg
,
&
float_type
))
{
// TODO work out if this should be floor, ceil or trunc
return
(
machine_int_t
)
mp_obj_float_get
(
arg
);
#endif
}
else
{
nlr_jump
(
mp_obj_new_exception_msg_varg
(
MP_QSTR_TypeError
,
"can't convert %s to int"
,
mp_obj_get_type_str
(
arg
)));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment