Skip to content

Commit 38a204e

Browse files
dpgeorgedpgeorge
committed
py: Introduce and use mp_raise_type_arg helper.
To reduce code size. Signed-off-by: Damien George <damien@micropython.org>
1 parent bb00125 commit 38a204e

10 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎extmod/modure.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
6868
mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
6969
mp_int_t no = mp_obj_get_int(no_in);
7070
if (no < 0 || no >= self->num_matches) {
71-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
71+
mp_raise_type_arg(&mp_type_IndexError, no_in);
7272
}
7373

7474
const char *start = self->caps[no * 2];
@@ -107,7 +107,7 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span
107107
if (n_args == 2) {
108108
no = mp_obj_get_int(args[1]);
109109
if (no < 0 || no >= self->num_matches) {
110-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, args[1]));
110+
mp_raise_type_arg(&mp_type_IndexError, args[1]);
111111
}
112112
}
113113

@@ -334,7 +334,7 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
334334
}
335335

336336
if (match_no >= (unsigned int)match->num_matches) {
337-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no)));
337+
mp_raise_type_arg(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no));
338338
}
339339

340340
const char *start_match = match->caps[match_no * 2];

‎extmod/moduzlib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
201201
return res;
202202

203203
error:
204-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)));
204+
mp_raise_type_arg(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st));
205205
}
206206
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);
207207

‎ports/unix/modjni.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ STATIC void check_exception(void) {
102102
mp_obj_t py_e = new_jobject(exc);
103103
JJ1(ExceptionClear);
104104
if (JJ(IsInstanceOf, exc, IndexException_class)) {
105-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, py_e));
105+
mp_raise_type_arg(&mp_type_IndexError, py_e);
106106
}
107-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_Exception, py_e));
107+
mp_raise_type_arg(&mp_type_Exception, py_e);
108108
}
109109
}
110110

‎py/dynruntime.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
215215
#define mp_obj_new_exception_arg1(e_type, arg) (mp_obj_new_exception_arg1_dyn((e_type), (arg)))
216216

217217
#define nlr_raise(o) (mp_raise_dyn(o))
218+
#define mp_raise_type_arg(type, arg) (mp_raise_dyn(mp_obj_new_exception_arg1_dyn((type), (arg))))
218219
#define mp_raise_msg(type, msg) (mp_fun_table.raise_msg((type), (msg)))
219220
#define mp_raise_OSError(er) (mp_raise_OSError_dyn(er))
220221
#define mp_raise_NotImplementedError(msg) (mp_raise_msg(&mp_type_NotImplementedError, (msg)))

‎py/objdict.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
190190
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
191191
mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
192192
if (elem == NULL) {
193-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index));
193+
mp_raise_type_arg(&mp_type_KeyError, index);
194194
} else {
195195
return elem->value;
196196
}
@@ -206,7 +206,7 @@ STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
206206
mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
207207
mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
208208
if (elem == NULL) {
209-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index));
209+
mp_raise_type_arg(&mp_type_KeyError, index);
210210
} else {
211211
return elem->value;
212212
}
@@ -295,7 +295,7 @@ STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_look
295295
if (elem == NULL || elem->value == MP_OBJ_NULL) {
296296
if (n_args == 2) {
297297
if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
298-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, args[1]));
298+
mp_raise_type_arg(&mp_type_KeyError, args[1]);
299299
} else {
300300
value = mp_const_none;
301301
}

‎py/objset.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) {
372372
check_set(self_in);
373373
mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
374374
if (mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND) == MP_OBJ_NULL) {
375-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, item));
375+
mp_raise_type_arg(&mp_type_KeyError, item);
376376
}
377377
return mp_const_none;
378378
}

‎py/objstr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
10811081
field_name = lookup;
10821082
mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP);
10831083
if (key_elem == NULL) {
1084-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, field_q));
1084+
mp_raise_type_arg(&mp_type_KeyError, field_q);
10851085
}
10861086
arg = key_elem->value;
10871087
}

‎py/pystack.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ void *mp_pystack_alloc(size_t n_bytes) {
4343
#endif
4444
if (MP_STATE_THREAD(pystack_cur) + n_bytes > MP_STATE_THREAD(pystack_end)) {
4545
// out of memory in the pystack
46-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
47-
MP_OBJ_NEW_QSTR(MP_QSTR_pystack_space_exhausted)));
46+
mp_raise_type_arg(&mp_type_RuntimeError, MP_OBJ_NEW_QSTR(MP_QSTR_pystack_space_exhausted));
4847
}
4948
void *ptr = MP_STATE_THREAD(pystack_cur);
5049
MP_STATE_THREAD(pystack_cur) += n_bytes;

‎py/runtime.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,21 +1565,24 @@ NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
15651565

15661566
#endif
15671567

1568+
NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
1569+
nlr_raise(mp_obj_new_exception_arg1(exc_type, arg));
1570+
}
1571+
15681572
NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
15691573
if (arg == MP_OBJ_NULL) {
15701574
mp_raise_type(&mp_type_StopIteration);
15711575
} else {
1572-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_StopIteration, arg));
1576+
mp_raise_type_arg(&mp_type_StopIteration, arg);
15731577
}
15741578
}
15751579

15761580
NORETURN void mp_raise_OSError(int errno_) {
1577-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
1581+
mp_raise_type_arg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_));
15781582
}
15791583

15801584
#if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
15811585
NORETURN void mp_raise_recursion_depth(void) {
1582-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
1583-
MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded)));
1586+
mp_raise_type_arg(&mp_type_RuntimeError, MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded));
15841587
}
15851588
#endif

‎py/runtime.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
184184
NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
185185
#endif
186186

187+
NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg);
187188
NORETURN void mp_raise_StopIteration(mp_obj_t arg);
188189
NORETURN void mp_raise_OSError(int errno_);
189190
NORETURN void mp_raise_recursion_depth(void);

0 commit comments

Comments
 (0)