Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-04 11:10:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki 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

33
py/objfun.c
View File

@@ -72,16 +72,7 @@ mp_obj_t fun_native_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
const mp_obj_type_t fun_native_type = {
{ &mp_const_type },
"function",
NULL, // print
NULL, // make_new
fun_native_call_n, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
.call_n = fun_native_call_n,
};
mp_obj_t rt_make_function_0(mp_fun_0_t fun) {
@@ -174,16 +165,7 @@ mp_obj_t fun_bc_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
const mp_obj_type_t fun_bc_type = {
{ &mp_const_type },
"function",
NULL, // print
NULL, // make_new
fun_bc_call_n, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
.call_n = fun_bc_call_n,
};
mp_obj_t mp_obj_new_fun_bc(int n_args, uint n_state, const byte *code) {
@@ -288,16 +270,7 @@ mp_obj_t fun_asm_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
static const mp_obj_type_t fun_asm_type = {
{ &mp_const_type },
"function",
NULL, // print
NULL, // make_new
fun_asm_call_n, // call_n
NULL, // unary_op
NULL, // binary_op
NULL, // getiter
NULL, // iternext
.methods = {
{NULL, NULL}, // end-of-list sentinel
},
.call_n = fun_asm_call_n,
};
mp_obj_t mp_obj_new_fun_asm(uint n_args, void *fun) {