summaryrefslogtreecommitdiffstatshomepage
path: root/py/obj.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-10 20:08:11 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-10 20:08:11 +0100
commitae491055fae927dbdfabeea69ffee166a9720a68 (patch)
tree796b4d02b8ce077697bfd7bf3b4613d53b5189ec /py/obj.h
parentf31b6ff33428d813511845bc6604fae42073676e (diff)
downloadmicropython-ae491055fae927dbdfabeea69ffee166a9720a68.tar.gz
micropython-ae491055fae927dbdfabeea69ffee166a9720a68.zip
py: Fix float/complex binop returning NULL; implement complex power.
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/py/obj.h b/py/obj.h
index b944d2fcb5..af6ef83189 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -429,11 +429,11 @@ typedef struct _mp_obj_float_t {
mp_float_t value;
} mp_obj_float_t;
mp_float_t mp_obj_float_get(mp_obj_t self_in);
-mp_obj_t mp_obj_float_binary_op(int op, mp_float_t lhs_val, mp_obj_t rhs);
+mp_obj_t mp_obj_float_binary_op(int op, mp_float_t lhs_val, mp_obj_t rhs); // can return MP_OBJ_NULL
// complex
void mp_obj_complex_get(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag);
-mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in);
+mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in); // can return MP_OBJ_NULL
#endif
// tuple