jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mpprint: Add %R (print object) & %K (print exception).

Browse source 
As well as adding some use sites to get an idea of whether this
is saving code size.

This also makes that `mp_obj_print_helper` print `MP_OBJ_NULL`
objects as `(nil)` (regardless of NDEBUG), which is otherwise
written at several use sites.

With just a few sites modified to use %R & %K, it already saved
around 28 bytes on MPS2_AN385 according to a quick local test.

Signed-off-by: Jeff Epler <jepler@gmail.com>
This commit is contained in:
Jeff Epler 2025-06-30 09:43:38 +01:00
parent 09541b7896
commit 6f86d237ca
6 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
py/modthread.c
View file

@ -189,10 +189,8 @@ static void *thread_entry(void *args_in) {
// swallow exception silently
} else {
// print exception out
mp_printf(MICROPY_ERROR_PRINTER, "Unhandled exception in thread started by ");
mp_obj_print_helper(MICROPY_ERROR_PRINTER, args->fun, PRINT_REPR);
mp_printf(MICROPY_ERROR_PRINTER, "\n");
mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(exc));
mp_printf(MICROPY_ERROR_PRINTER, "Unhandled exception in thread started by %R\n%K",
PRINT_REPR, args->fun, MP_OBJ_FROM_PTR(exc));
}
}

11
py/mpprint.c
View file

@ -475,6 +475,17 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
chrs += mp_print_strn(print, &str, 1, flags, fill, width);
break;
}
case 'K': {
mp_obj_t obj = va_arg(args, mp_obj_t);
mp_obj_print_exception(print, obj);
break;
}
case 'R': {
mp_print_kind_t kind = va_arg(args, int);
mp_obj_t obj = va_arg(args, mp_obj_t);
mp_obj_print_helper(print, obj, kind);
break;
}
case 'q': {
qstr qst = va_arg(args, qstr);
size_t len;

3
py/objattrtuple.c
View file

@ -38,8 +38,7 @@ void mp_obj_attrtuple_print_helper(const mp_print_t *print, const qstr *fields,
if (i > 0) {
mp_print_str(print, ", ");
}
mp_printf(print, "%q=", fields[i]);
mp_obj_print_helper(print, o->items[i], PRINT_REPR);
mp_printf(print, "%q=%R", fields[i], PRINT_REPR, o->items[i]);
}
mp_print_str(print, ")");
}

6
py/objboundmeth.c
View file

@ -39,11 +39,7 @@ typedef struct _mp_obj_bound_meth_t {
static void bound_meth_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(o_in);
mp_printf(print, "<bound_method %p ", o);
mp_obj_print_helper(print, o->self, PRINT_REPR);
mp_print_str(print, ".");
mp_obj_print_helper(print, o->meth, PRINT_REPR);
mp_print_str(print, ">");
mp_printf(print, "<bound_method %p %R.%R>", o, PRINT_REPR, o->self, PRINT_REPR, o->meth);
}
#endif

8
py/objcell.c
View file

@ -30,13 +30,7 @@
static void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_cell_t *o = MP_OBJ_TO_PTR(o_in);
mp_printf(print, "<cell %p ", o->obj);
if (o->obj == MP_OBJ_NULL) {
mp_print_str(print, "(nil)");
} else {
mp_obj_print_helper(print, o->obj, PRINT_REPR);
}
mp_print_str(print, ">");
mp_printf(print, "<cell %p %R>", o->obj, PRINT_REPR, o->obj);
}
#endif

10
py/objclosure.c
View file

@ -63,16 +63,10 @@ static mp_obj_t closure_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
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 = MP_OBJ_TO_PTR(o_in);
mp_print_str(print, "<closure ");
mp_obj_print_helper(print, o->fun, PRINT_REPR);
mp_printf(print, " at %p, n_closed=%u ", o, (int)o->n_closed);
mp_printf(print, "<closure %R at %p, n_closed=%u", PRINT_REPR, o->fun, o, (int)o->n_closed);
for (size_t i = 0; i < o->n_closed; i++) {
if (o->closed[i] == MP_OBJ_NULL) {
mp_print_str(print, "(nil)");
} else {
mp_obj_print_helper(print, o->closed[i], PRINT_REPR);
}
mp_print_str(print, " ");
mp_obj_print_helper(print, o->closed[i], PRINT_REPR);
}
mp_print_str(print, ">");
}