diff options
author | Damien George <damien.p.george@gmail.com> | 2015-04-09 23:56:15 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2015-04-16 14:30:16 +0000 |
commit | 7f9d1d6ab923096582622b700bedb6a571518eac (patch) | |
tree | f97a0d56ba0279dd4ef2a44f00676193c4d49d8b /py/objclosure.c | |
parent | 56beb01724d4f0027babc5d23f016efbde4c4190 (diff) |
py: Overhaul and simplify printf/pfenv mechanism.
Previous to this patch the printing mechanism was a bit of a tangled
mess. This patch attempts to consolidate printing into one interface.
All (non-debug) printing now uses the mp_print* family of functions,
mainly mp_printf. All these functions take an mp_print_t structure as
their first argument, and this structure defines the printing backend
through the "print_strn" function of said structure.
Printing from the uPy core can reach the platform-defined print code via
two paths: either through mp_sys_stdout_obj (defined pert port) in
conjunction with mp_stream_write; or through the mp_plat_print structure
which uses the MP_PLAT_PRINT_STRN macro to define how string are printed
on the platform. The former is only used when MICROPY_PY_IO is defined.
With this new scheme printing is generally more efficient (less layers
to go through, less arguments to pass), and, given an mp_print_t*
structure, one can call mp_print_str for efficiency instead of
mp_printf("%s", ...). Code size is also reduced by around 200 bytes on
Thumb2 archs.
Diffstat (limited to 'py/objclosure.c')
-rw-r--r-- | py/objclosure.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/py/objclosure.c b/py/objclosure.c index 95c1adde0..a4000e5dd 100644 --- a/py/objclosure.c +++ b/py/objclosure.c @@ -60,21 +60,21 @@ STATIC mp_obj_t closure_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, } #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED -STATIC void closure_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) { +STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { (void)kind; mp_obj_closure_t *o = o_in; - print(env, "<closure "); - mp_obj_print_helper(print, env, o->fun, PRINT_REPR); - print(env, " at %p, n_closed=%u ", o, o->n_closed); + mp_print_str(print, "<closure "); + mp_obj_print_helper(print, o->fun, PRINT_REPR); + mp_printf(print, " at %p, n_closed=%u ", o, o->n_closed); for (mp_uint_t i = 0; i < o->n_closed; i++) { if (o->closed[i] == MP_OBJ_NULL) { - print(env, "(nil)"); + mp_print_str(print, "(nil)"); } else { - mp_obj_print_helper(print, env, o->closed[i], PRINT_REPR); + mp_obj_print_helper(print, o->closed[i], PRINT_REPR); } - print(env, " "); + mp_print_str(print, " "); } - print(env, ">"); + mp_print_str(print, ">"); } #endif |