summaryrefslogtreecommitdiff
path: root/py/objarray.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-04-09 23:56:15 +0100
committerDamien George <damien.p.george@gmail.com>2015-04-16 14:30:16 +0000
commit7f9d1d6ab923096582622b700bedb6a571518eac (patch)
treef97a0d56ba0279dd4ef2a44f00676193c4d49d8b /py/objarray.c
parent56beb01724d4f0027babc5d23f016efbde4c4190 (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/objarray.c')
-rw-r--r--py/objarray.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/py/objarray.c b/py/objarray.c
index cb2b2b6a1..33cd7ecc3 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -76,26 +76,26 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
// array
#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC void array_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
+STATIC void array_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_array_t *o = o_in;
if (o->typecode == BYTEARRAY_TYPECODE) {
- print(env, "bytearray(b");
- mp_str_print_quoted(print, env, o->items, o->len, true);
+ mp_print_str(print, "bytearray(b");
+ mp_str_print_quoted(print, o->items, o->len, true);
} else {
- print(env, "array('%c'", o->typecode);
+ mp_printf(print, "array('%c'", o->typecode);
if (o->len > 0) {
- print(env, ", [");
+ mp_print_str(print, ", [");
for (mp_uint_t i = 0; i < o->len; i++) {
if (i > 0) {
- print(env, ", ");
+ mp_print_str(print, ", ");
}
- mp_obj_print_helper(print, env, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
+ mp_obj_print_helper(print, mp_binary_get_val_array(o->typecode, o->items, i), PRINT_REPR);
}
- print(env, "]");
+ mp_print_str(print, "]");
}
}
- print(env, ")");
+ mp_print_str(print, ")");
}
#endif