diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:09:04 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-13 23:09:04 +0000 |
commit | f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3 (patch) | |
tree | ae93f78ed97e4d820150a7b0d8c026f94cfb790e /py/runtime.h | |
parent | 189c8e1cc46896382b6d19da8b89a4cc4f7e3864 (diff) | |
parent | ca318bba0d97c66d8fb14a089d8fa269a0e1b424 (diff) | |
download | micropython-f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3.tar.gz micropython-f5a0a7d2b30d390f03dd0b6f8866ec619d2c5ee3.zip |
Merge remote-tracking branch 'upstream/master' into containment
Diffstat (limited to 'py/runtime.h')
-rw-r--r-- | py/runtime.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/py/runtime.h b/py/runtime.h index ac53e14110..32cb47684f 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -12,10 +12,8 @@ void rt_store_global(qstr qstr, mp_obj_t obj); mp_obj_t rt_unary_op(int op, mp_obj_t arg); mp_obj_t rt_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs); mp_obj_t rt_make_function_from_id(int unique_code_id); -mp_obj_t rt_make_function_0(mp_fun_0_t f); -mp_obj_t rt_make_function_1(mp_fun_1_t f); -mp_obj_t rt_make_function_2(mp_fun_2_t f); -mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t f); +mp_obj_t rt_make_function_n(int n_args, void *fun); // fun must have the correct signature for n_args fixed arguments +mp_obj_t rt_make_function_var(int n_args_min, mp_fun_var_t fun); mp_obj_t rt_make_function_var_between(int n_args_min, int n_args_max, mp_fun_var_t fun); // min and max are inclusive mp_obj_t rt_make_closure_from_id(int unique_code_id, mp_obj_t closure_tuple); mp_obj_t rt_call_function_0(mp_obj_t fun); |