Skip to content

Commit 94c41bb

Browse files
dpgeorgedpgeorge
committed
py: Use mp_raise_TypeError/mp_raise_ValueError helpers where possible.
Saves 168 bytes on bare-arm.
1 parent 7b1804c commit 94c41bb

17 files changed

+53
-53
lines changed

‎py/argcheck.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void mp_arg_check_num(size_t n_args, size_t n_kw, size_t n_args_min, size_t n_ar
3737
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
3838
mp_arg_error_terse_mismatch();
3939
} else {
40-
mp_raise_msg(&mp_type_TypeError, "function does not take keyword arguments");
40+
mp_raise_TypeError("function does not take keyword arguments");
4141
}
4242
}
4343

@@ -115,15 +115,15 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
115115
mp_arg_error_terse_mismatch();
116116
} else {
117117
// TODO better error message
118-
mp_raise_msg(&mp_type_TypeError, "extra positional arguments given");
118+
mp_raise_TypeError("extra positional arguments given");
119119
}
120120
}
121121
if (kws_found < kws->used) {
122122
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
123123
mp_arg_error_terse_mismatch();
124124
} else {
125125
// TODO better error message
126-
mp_raise_msg(&mp_type_TypeError, "extra keyword arguments given");
126+
mp_raise_TypeError("extra keyword arguments given");
127127
}
128128
}
129129
}
@@ -136,7 +136,7 @@ void mp_arg_parse_all_kw_array(size_t n_pos, size_t n_kw, const mp_obj_t *args,
136136

137137
#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE || _MSC_VER
138138
NORETURN void mp_arg_error_terse_mismatch(void) {
139-
mp_raise_msg(&mp_type_TypeError, "argument num/types mismatch");
139+
mp_raise_TypeError("argument num/types mismatch");
140140
}
141141
#endif
142142

‎py/bc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
197197
// Didn't find name match with positional args
198198
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
199199
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
200-
mp_raise_msg(&mp_type_TypeError, "unexpected keyword argument");
200+
mp_raise_TypeError("unexpected keyword argument");
201201
} else {
202202
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
203203
"unexpected keyword argument '%q'", MP_OBJ_QSTR_VALUE(wanted_arg_name)));
@@ -250,7 +250,7 @@ continue2:;
250250
} else {
251251
// no keyword arguments given
252252
if (n_kwonly_args != 0) {
253-
mp_raise_msg(&mp_type_TypeError, "function missing keyword-only argument");
253+
mp_raise_TypeError("function missing keyword-only argument");
254254
}
255255
if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) {
256256
*var_pos_kw_args = mp_obj_new_dict(0);

‎py/builtinevex.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ STATIC mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
9595
case MP_QSTR_exec: parse_input_kind = MP_PARSE_FILE_INPUT; break;
9696
case MP_QSTR_eval: parse_input_kind = MP_PARSE_EVAL_INPUT; break;
9797
default:
98-
mp_raise_msg(&mp_type_ValueError, "bad compile mode");
98+
mp_raise_ValueError("bad compile mode");
9999
}
100100

101101
mp_obj_code_t *code = m_new_obj(mp_obj_code_t);

‎py/builtinimport.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
341341
qstr new_mod_q = qstr_from_strn(new_mod, new_mod_l);
342342
DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q));
343343
if (new_mod_q == MP_QSTR_) {
344-
mp_raise_msg(&mp_type_ValueError, "cannot perform relative import");
344+
mp_raise_ValueError("cannot perform relative import");
345345
}
346346
module_name = MP_OBJ_NEW_QSTR(new_mod_q);
347347
mod_str = new_mod;

‎py/modbuiltins.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
180180
str[3] = (c & 0x3F) | 0x80;
181181
len = 4;
182182
} else {
183-
mp_raise_msg(&mp_type_ValueError, "chr() arg not in range(0x110000)");
183+
mp_raise_ValueError("chr() arg not in range(0x110000)");
184184
}
185185
return mp_obj_new_str(str, len, true);
186186
#else
@@ -189,7 +189,7 @@ STATIC mp_obj_t mp_builtin_chr(mp_obj_t o_in) {
189189
char str[1] = {ord};
190190
return mp_obj_new_str(str, 1, true);
191191
} else {
192-
mp_raise_msg(&mp_type_ValueError, "chr() arg not in range(256)");
192+
mp_raise_ValueError("chr() arg not in range(256)");
193193
}
194194
#endif
195195
}
@@ -289,7 +289,7 @@ STATIC mp_obj_t mp_builtin_min_max(size_t n_args, const mp_obj_t *args, mp_map_t
289289
if (default_elem != NULL) {
290290
best_obj = default_elem->value;
291291
} else {
292-
mp_raise_msg(&mp_type_ValueError, "arg is an empty sequence");
292+
mp_raise_ValueError("arg is an empty sequence");
293293
}
294294
}
295295
return best_obj;
@@ -504,7 +504,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum);
504504

505505
STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
506506
if (n_args > 1) {
507-
mp_raise_msg(&mp_type_TypeError, "must use keyword argument for key function");
507+
mp_raise_TypeError("must use keyword argument for key function");
508508
}
509509
mp_obj_t self = mp_type_list.make_new(&mp_type_list, 1, 0, args);
510510
mp_obj_list_sort(1, &self, kwargs);

‎py/modthread.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ STATIC mp_obj_t mod_thread_start_new_thread(size_t n_args, const mp_obj_t *args)
227227
} else {
228228
// positional and keyword arguments
229229
if (mp_obj_get_type(args[2]) != &mp_type_dict) {
230-
mp_raise_msg(&mp_type_TypeError, "expecting a dict for keyword args");
230+
mp_raise_TypeError("expecting a dict for keyword args");
231231
}
232232
mp_map_t *map = &((mp_obj_dict_t*)MP_OBJ_TO_PTR(args[2]))->map;
233233
th_args = m_new_obj_var(thread_entry_args_t, mp_obj_t, pos_args_len + 2 * map->used);

‎py/obj.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {
229229
return mp_obj_int_get_checked(arg);
230230
} else {
231231
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
232-
mp_raise_msg(&mp_type_TypeError, "can't convert to int");
232+
mp_raise_TypeError("can't convert to int");
233233
} else {
234234
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
235235
"can't convert %s to int", mp_obj_get_type_str(arg)));
@@ -279,7 +279,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
279279
return mp_obj_float_get(arg);
280280
} else {
281281
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
282-
mp_raise_msg(&mp_type_TypeError, "can't convert to float");
282+
mp_raise_TypeError("can't convert to float");
283283
} else {
284284
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
285285
"can't convert %s to float", mp_obj_get_type_str(arg)));
@@ -310,7 +310,7 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
310310
mp_obj_complex_get(arg, real, imag);
311311
} else {
312312
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
313-
mp_raise_msg(&mp_type_TypeError, "can't convert to complex");
313+
mp_raise_TypeError("can't convert to complex");
314314
} else {
315315
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
316316
"can't convert %s to complex", mp_obj_get_type_str(arg)));
@@ -328,7 +328,7 @@ void mp_obj_get_array(mp_obj_t o, mp_uint_t *len, mp_obj_t **items) {
328328
mp_obj_list_get(o, len, items);
329329
} else {
330330
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
331-
mp_raise_msg(&mp_type_TypeError, "expected tuple/list");
331+
mp_raise_TypeError("expected tuple/list");
332332
} else {
333333
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
334334
"object '%s' is not a tuple or list", mp_obj_get_type_str(o)));
@@ -342,7 +342,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
342342
mp_obj_get_array(o, &seq_len, items);
343343
if (seq_len != len) {
344344
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
345-
mp_raise_msg(&mp_type_ValueError, "tuple/list has wrong length");
345+
mp_raise_ValueError("tuple/list has wrong length");
346346
} else {
347347
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
348348
"requested length %d but object has length %d", (int)len, (int)seq_len));
@@ -357,7 +357,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
357357
i = MP_OBJ_SMALL_INT_VALUE(index);
358358
} else if (!mp_obj_get_int_maybe(index, &i)) {
359359
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
360-
mp_raise_msg(&mp_type_TypeError, "indices must be integers");
360+
mp_raise_TypeError("indices must be integers");
361361
} else {
362362
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
363363
"%q indices must be integers, not %s",
@@ -412,7 +412,7 @@ mp_obj_t mp_obj_len(mp_obj_t o_in) {
412412
mp_obj_t len = mp_obj_len_maybe(o_in);
413413
if (len == MP_OBJ_NULL) {
414414
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
415-
mp_raise_msg(&mp_type_TypeError, "object has no len");
415+
mp_raise_TypeError("object has no len");
416416
} else {
417417
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
418418
"object of type '%s' has no len()", mp_obj_get_type_str(o_in)));
@@ -453,7 +453,7 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
453453
}
454454
if (value == MP_OBJ_NULL) {
455455
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
456-
mp_raise_msg(&mp_type_TypeError, "object does not support item deletion");
456+
mp_raise_TypeError("object does not support item deletion");
457457
} else {
458458
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
459459
"'%s' object does not support item deletion", mp_obj_get_type_str(base)));
@@ -468,7 +468,7 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
468468
}
469469
} else {
470470
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
471-
mp_raise_msg(&mp_type_TypeError, "object does not support item assignment");
471+
mp_raise_TypeError("object does not support item assignment");
472472
} else {
473473
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
474474
"'%s' object does not support item assignment", mp_obj_get_type_str(base)));
@@ -502,7 +502,7 @@ bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
502502

503503
void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
504504
if (!mp_get_buffer(obj, bufinfo, flags)) {
505-
mp_raise_msg(&mp_type_TypeError, "object with buffer protocol required");
505+
mp_raise_TypeError("object with buffer protocol required");
506506
}
507507
}
508508

‎py/objarray.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
391391
mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
392392
if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
393393
compat_error:
394-
mp_raise_msg(&mp_type_ValueError, "lhs and rhs should be compatible");
394+
mp_raise_ValueError("lhs and rhs should be compatible");
395395
}
396396
src_len = src_slice->len;
397397
src_items = src_slice->items;

‎py/objdict.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwarg
386386
if (key == MP_OBJ_STOP_ITERATION
387387
|| value == MP_OBJ_STOP_ITERATION
388388
|| stop != MP_OBJ_STOP_ITERATION) {
389-
mp_raise_msg(&mp_type_ValueError, "dictionary update sequence has the wrong length");
389+
mp_raise_ValueError("dictionary update sequence has the wrong length");
390390
} else {
391391
mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;
392392
}

‎py/objgenerator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
105105
}
106106
if (self->code_state.sp == self->code_state.state - 1) {
107107
if (send_value != mp_const_none) {
108-
mp_raise_msg(&mp_type_TypeError, "can't send non-None value to a just-started generator");
108+
mp_raise_TypeError("can't send non-None value to a just-started generator");
109109
}
110110
} else {
111111
*self->code_state.sp = send_value;

0 commit comments

Comments
 (0)