Skip to content

Commit 9857c4a

Browse files
dpgeorgepfalcon
dpgeorge
authored and
pfalcon
committed
py: Add option to compile without any error messages at all.
This introduces a new option, MICROPY_ERROR_REPORTING_NONE, which completely disables all error messages. To be used in cases where MicroPython needs to fit in very limited systems. Signed-off-by: Damien George <[email protected]> --- Updated for Pycopy. Change-Id: I4bbaf1d1f22c1b84a98c4316c3ce99445f873560 Signed-off-by: Paul Sokolovsky <[email protected]>
1 parent 0c2e7c6 commit 9857c4a

16 files changed

+117
-67
lines changed

‎py/argcheck.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
4949
size_t n_args_max = (sig >> 1) & 0xffff;
5050

5151
if (n_kw && !takes_kw) {
52-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
52+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
5353
mp_arg_error_terse_mismatch();
5454
#else
5555
mp_raise_TypeError(MP_ERROR_TEXT("function doesn't take keyword arguments"));
@@ -58,7 +58,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
5858

5959
if (n_args_min == n_args_max) {
6060
if (n_args != n_args_min) {
61-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
61+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
6262
mp_arg_error_terse_mismatch();
6363
#else
6464
mp_raise_msg_varg(&mp_type_TypeError,
@@ -68,15 +68,15 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
6868
}
6969
} else {
7070
if (n_args < n_args_min) {
71-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
71+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
7272
mp_arg_error_terse_mismatch();
7373
#else
7474
mp_raise_msg_varg(&mp_type_TypeError,
7575
MP_ERROR_TEXT("function missing %d required positional arguments"),
7676
n_args_min - n_args);
7777
#endif
7878
} else if (n_args > n_args_max) {
79-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
79+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
8080
mp_arg_error_terse_mismatch();
8181
#else
8282
mp_raise_msg_varg(&mp_type_TypeError,
@@ -101,7 +101,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
101101
mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qst), MP_MAP_LOOKUP);
102102
if (kw == NULL) {
103103
if (allowed[i].flags & MP_ARG_REQUIRED) {
104-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
104+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
105105
mp_arg_error_terse_mismatch();
106106
#else
107107
mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("'%q' argument required"), allowed[i].qst);
@@ -125,15 +125,15 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
125125
}
126126
if (pos_found < n_pos) {
127127
extra_positional:
128-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
128+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
129129
mp_arg_error_terse_mismatch();
130130
#else
131131
// TODO better error message
132132
mp_raise_TypeError(MP_ERROR_TEXT("extra positional arguments given"));
133133
#endif
134134
}
135135
if (kws_found < kws->used) {
136-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
136+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
137137
mp_arg_error_terse_mismatch();
138138
#else
139139
// TODO better error message

‎py/bc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ STATIC NORETURN void raise_from_func(mp_code_state_t *code_state, mp_obj_t exc);
7979

8080
STATIC NORETURN void fun_pos_args_mismatch(mp_code_state_t *code_state, size_t expected, size_t given) {
8181
mp_obj_fun_bc_t *f = code_state->fun_bc;
82-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
82+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
8383
// generic message, used also for other argument issues
8484
(void)f;
8585
(void)expected;
@@ -228,7 +228,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
228228
}
229229
// Didn't find name match with positional args
230230
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
231-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
231+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
232232
mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_TypeError,
233233
MP_ERROR_TEXT("unexpected keyword argument"));
234234
#else

‎py/builtinimport.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
453453
#endif
454454
if (module_obj == MP_OBJ_NULL) {
455455
// couldn't find the file, so fail
456-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
456+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
457457
mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
458458
#else
459459
mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), mod_name);
@@ -578,7 +578,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
578578
#endif
579579

580580
// Couldn't find the module, so fail
581-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
581+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
582582
mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
583583
#else
584584
mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), module_name_qstr);

‎py/compile.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2658,7 +2658,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
26582658
compile_node(comp, pn_i);
26592659
if (is_dict) {
26602660
if (!is_key_value) {
2661-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
2661+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
26622662
compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
26632663
#else
26642664
compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting key:value for dict"));
@@ -2668,7 +2668,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
26682668
EMIT(store_map);
26692669
} else {
26702670
if (is_key_value) {
2671-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
2671+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
26722672
compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
26732673
#else
26742674
compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting just a value for set"));

‎py/misc.h

+4
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ typedef union _mp_float_union_t {
265265

266266
#if MICROPY_ROM_TEXT_COMPRESSION
267267

268+
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
269+
#error "MICROPY_ERROR_REPORTING_NONE requires MICROPY_ROM_TEXT_COMPRESSION disabled"
270+
#endif
271+
268272
#ifdef NO_QSTR
269273

270274
// Compression enabled but doing QSTR extraction.

‎py/modbuiltins.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
376376
}
377377
}
378378

379-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
379+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
380380
mp_raise_TypeError(MP_ERROR_TEXT("ord expects a character"));
381381
#else
382382
mp_raise_msg_varg(&mp_type_TypeError,

‎py/mpconfig.h

+2
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,8 @@ typedef long long mp_longint_impl_t;
702702
#error MICROPY_ENABLE_FUNCTION_DOC_STRING depends on MICROPY_ENABLE_DOC_STRING
703703
#endif
704704

705+
// Exception messages are removed (requires disabling MICROPY_ROM_TEXT_COMPRESSION)
706+
#define MICROPY_ERROR_REPORTING_NONE (0)
705707
// Exception messages are short static strings
706708
#define MICROPY_ERROR_REPORTING_TERSE (1)
707709
// Exception messages provide basic error details

‎py/obj.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
342342
mp_float_t val;
343343

344344
if (!mp_obj_get_float_maybe(arg, &val)) {
345-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
345+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
346346
mp_raise_TypeError(MP_ERROR_TEXT("can't convert to float"));
347347
#else
348348
mp_raise_msg_varg(&mp_type_TypeError,
@@ -382,7 +382,7 @@ bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag)
382382

383383
void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
384384
if (!mp_obj_get_complex_maybe(arg, real, imag)) {
385-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
385+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
386386
mp_raise_TypeError(MP_ERROR_TEXT("can't convert to complex"));
387387
#else
388388
mp_raise_msg_varg(&mp_type_TypeError,
@@ -400,7 +400,7 @@ void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
400400
} else if (mp_obj_is_type(o, &mp_type_list)) {
401401
mp_obj_list_get(o, len, items);
402402
} else {
403-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
403+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
404404
mp_raise_TypeError(MP_ERROR_TEXT("expected tuple/list"));
405405
#else
406406
mp_raise_msg_varg(&mp_type_TypeError,
@@ -414,7 +414,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
414414
size_t seq_len;
415415
mp_obj_get_array(o, &seq_len, items);
416416
if (seq_len != len) {
417-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
417+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
418418
mp_raise_ValueError(MP_ERROR_TEXT("tuple/list has wrong length"));
419419
#else
420420
mp_raise_msg_varg(&mp_type_ValueError,
@@ -429,7 +429,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
429429
if (mp_obj_is_small_int(index)) {
430430
i = MP_OBJ_SMALL_INT_VALUE(index);
431431
} else if (!mp_obj_get_int_maybe(index, &i)) {
432-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
432+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
433433
mp_raise_TypeError(MP_ERROR_TEXT("indices must be integers"));
434434
#else
435435
mp_raise_msg_varg(&mp_type_TypeError,
@@ -449,7 +449,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
449449
}
450450
} else {
451451
if (i < 0 || (mp_uint_t)i >= len) {
452-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
452+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
453453
mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("index out of range"));
454454
#else
455455
mp_raise_msg_varg(&mp_type_IndexError, MP_ERROR_TEXT("%q index out of range"), type->name);
@@ -483,7 +483,7 @@ mp_obj_t mp_obj_id(mp_obj_t o_in) {
483483
mp_obj_t mp_obj_len(mp_obj_t o_in) {
484484
mp_obj_t len = mp_obj_len_maybe(o_in);
485485
if (len == MP_OBJ_NULL) {
486-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
486+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
487487
mp_raise_TypeError(MP_ERROR_TEXT("object has no len"));
488488
#else
489489
mp_raise_msg_varg(&mp_type_TypeError,
@@ -524,21 +524,21 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
524524
// TODO: call base classes here?
525525
}
526526
if (value == MP_OBJ_NULL) {
527-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
527+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
528528
mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item deletion"));
529529
#else
530530
mp_raise_msg_varg(&mp_type_TypeError,
531531
MP_ERROR_TEXT("'%s' object doesn't support item deletion"), mp_obj_get_type_str(base));
532532
#endif
533533
} else if (value == MP_OBJ_SENTINEL) {
534-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
534+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
535535
mp_raise_TypeError(MP_ERROR_TEXT("object isn't subscriptable"));
536536
#else
537537
mp_raise_msg_varg(&mp_type_TypeError,
538538
MP_ERROR_TEXT("'%s' object isn't subscriptable"), mp_obj_get_type_str(base));
539539
#endif
540540
} else {
541-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
541+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
542542
mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item assignment"));
543543
#else
544544
mp_raise_msg_varg(&mp_type_TypeError,

‎py/obj.h

+5
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,13 @@ mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
785785
mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type);
786786
mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg);
787787
mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args);
788+
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
789+
#define mp_obj_new_exception_msg(exc_type, msg) mp_obj_new_exception(exc_type)
790+
#define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type)
791+
#else
788792
mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
789793
mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!)
794+
#endif
790795
#ifdef va_start
791796
mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above
792797
#endif

‎py/objexcept.c

+4
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,8 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args,
408408
return mp_obj_exception_make_new(exc_type, n_args, 0, args);
409409
}
410410

411+
#if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_NONE
412+
411413
mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
412414
// Check that the given type is an exception type
413415
assert(exc_type->make_new == mp_obj_exception_make_new);
@@ -553,6 +555,8 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
553555
return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
554556
}
555557

558+
#endif
559+
556560
// return true if the given object is an exception type
557561
bool mp_obj_is_exception_type(mp_obj_t self_in) {
558562
if (mp_obj_is_type(self_in, &mp_type_type)) {

‎py/objnamedtuple.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
9898
const mp_obj_namedtuple_type_t *type = (const mp_obj_namedtuple_type_t *)type_in;
9999
size_t num_fields = type->n_fields;
100100
if (n_args + n_kw != num_fields) {
101-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
101+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
102102
mp_arg_error_terse_mismatch();
103103
#elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
104104
mp_raise_msg_varg(&mp_type_TypeError,
@@ -124,14 +124,14 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
124124
qstr kw = mp_obj_str_get_qstr(args[i]);
125125
size_t id = mp_obj_namedtuple_find_field(type, kw);
126126
if (id == (size_t)-1) {
127-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
127+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
128128
mp_arg_error_terse_mismatch();
129129
#else
130130
mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("unexpected keyword argument '%q'"), kw);
131131
#endif
132132
}
133133
if (tuple->items[id] != MP_OBJ_NULL) {
134-
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
134+
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
135135
mp_arg_error_terse_mismatch();
136136
#else
137137
mp_raise_msg_varg(&mp_type_TypeError,

0 commit comments

Comments
 (0)