TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus

Browse Source 
Conflicts:
	py/objcomplex.c
This commit is contained in:
Damien George
2014-01-07 15:58:30 +00:00
parent d49420e74c a5a01df81d
commit 97209d38e1
30 changed files with 117 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
py/objcomplex.c
View File

@@ -87,14 +87,10 @@ static mp_obj_t complex_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
const mp_obj_type_t complex_type = {
{ &mp_const_type },
"complex",
complex_print, // print
complex_make_new, // make_new
NULL, // call_n
complex_unary_op, // unary_op
complex_binary_op, // binary_op
NULL, // getiter
NULL, // iternext
.methods = { { NULL, NULL }, },
.print = complex_print,
.make_new = complex_make_new,
.unary_op = complex_unary_op,
.binary_op = complex_binary_op,
};
mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) {