Skip to content

Commit b86e3f9

Browse files
dpgeorgedpgeorge
committed
py: implement some basic exception matching.
1 parent 8f9e2ee commit b86e3f9

5 files changed

Lines changed: 38 additions & 6 deletions

File tree

‎py/obj.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ extern const mp_obj_type_t bool_type;
176176
mp_obj_t mp_obj_cell_get(mp_obj_t self_in);
177177
void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj);
178178

179+
// exception
180+
extern const mp_obj_type_t exception_type;
181+
qstr mp_obj_exception_get_type(mp_obj_t self_in);
182+
179183
// str
180184
extern const mp_obj_type_t str_type;
181185
qstr mp_obj_str_get(mp_obj_t self_in);

‎py/objexcept.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,9 @@ mp_obj_t mp_obj_new_exception_msg_2_args(qstr id, const char *fmt, const char *a
8484
o->args[2] = a2;
8585
return o;
8686
}
87+
88+
qstr mp_obj_exception_get_type(mp_obj_t self_in) {
89+
assert(MP_OBJ_IS_TYPE(self_in, &exception_type));
90+
mp_obj_exception_t *self = self_in;
91+
return self->id;
92+
}

‎py/runtime.c‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,23 @@ void rt_init(void) {
103103
map_locals = map_globals = mp_map_new(MP_MAP_QSTR, 1);
104104
mp_qstr_map_lookup(map_globals, qstr_from_str_static("__name__"), true)->value = mp_obj_new_str(qstr_from_str_static("__main__"));
105105

106+
// init built-in hash table
106107
mp_map_init(&map_builtins, MP_MAP_QSTR, 3);
108+
109+
// built-in exceptions (TODO, make these proper classes)
110+
mp_qstr_map_lookup(&map_builtins, rt_q_AttributeError, true)->value = mp_obj_new_exception(rt_q_AttributeError);
111+
mp_qstr_map_lookup(&map_builtins, rt_q_IndexError, true)->value = mp_obj_new_exception(rt_q_IndexError);
112+
mp_qstr_map_lookup(&map_builtins, rt_q_KeyError, true)->value = mp_obj_new_exception(rt_q_KeyError);
113+
mp_qstr_map_lookup(&map_builtins, rt_q_NameError, true)->value = mp_obj_new_exception(rt_q_NameError);
114+
mp_qstr_map_lookup(&map_builtins, rt_q_TypeError, true)->value = mp_obj_new_exception(rt_q_TypeError);
115+
mp_qstr_map_lookup(&map_builtins, rt_q_SyntaxError, true)->value = mp_obj_new_exception(rt_q_SyntaxError);
116+
mp_qstr_map_lookup(&map_builtins, rt_q_ValueError, true)->value = mp_obj_new_exception(rt_q_ValueError);
117+
118+
// built-in core functions
107119
mp_qstr_map_lookup(&map_builtins, rt_q___build_class__, true)->value = rt_make_function_2(mp_builtin___build_class__);
108120
mp_qstr_map_lookup(&map_builtins, qstr_from_str_static("__repl_print__"), true)->value = rt_make_function_1(mp_builtin___repl_print__);
121+
122+
// built-in user functions
109123
mp_qstr_map_lookup(&map_builtins, qstr_from_str_static("abs"), true)->value = rt_make_function_1(mp_builtin_abs);
110124
mp_qstr_map_lookup(&map_builtins, qstr_from_str_static("all"), true)->value = rt_make_function_1(mp_builtin_all);
111125
mp_qstr_map_lookup(&map_builtins, qstr_from_str_static("any"), true)->value = rt_make_function_1(mp_builtin_any);
@@ -550,6 +564,18 @@ mp_obj_t rt_compare_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
550564
}
551565
}
552566

567+
// deal with exception_match
568+
if (op == RT_COMPARE_OP_EXCEPTION_MATCH) {
569+
// TODO properly! at the moment it just compares the exception identifier for equality
570+
if (MP_OBJ_IS_TYPE(lhs, &exception_type) && MP_OBJ_IS_TYPE(rhs, &exception_type)) {
571+
if (mp_obj_exception_get_type(lhs) == mp_obj_exception_get_type(rhs)) {
572+
return mp_const_true;
573+
} else {
574+
return mp_const_false;
575+
}
576+
}
577+
}
578+
553579
// deal with small ints
554580
if (MP_OBJ_IS_SMALL_INT(lhs) && MP_OBJ_IS_SMALL_INT(rhs)) {
555581
mp_small_int_t lhs_val = MP_OBJ_SMALL_INT_VALUE(lhs);

‎py/vm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **
491491
// push(traceback, exc-val, exc-type)
492492
PUSH(mp_const_none);
493493
PUSH(nlr.ret_val);
494-
PUSH(mp_const_none);
494+
PUSH(nlr.ret_val); // TODO should be type(nlr.ret_val), I think...
495495

496496
} else {
497497
// re-raise exception to higher level

‎unix/main.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,10 @@ void do_file(const char *file) {
115115
if (module_fun != mp_const_none) {
116116
nlr_buf_t nlr;
117117
if (nlr_push(&nlr) == 0) {
118-
mp_obj_t ret = rt_call_function_0(module_fun);
119-
printf("done! got: ");
120-
mp_obj_print(ret);
121-
printf("\n");
118+
rt_call_function_0(module_fun);
122119
nlr_pop();
123120
} else {
124121
// uncaught exception
125-
printf("exception: ");
126122
mp_obj_print((mp_obj_t)nlr.ret_val);
127123
printf("\n");
128124
}

0 commit comments

Comments
 (0)