Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2026-02-04 06:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2f776ae05a0f378e8f65b90a4e6d8ba622801dd5 into 2fa14c588463bf576bce766f6ae996e7e8e10271

Browse Source
This commit is contained in:
killcerr 2026-01-31 22:40:20 +00:00 committed by GitHub
commit eaa2e6d6f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/interpreter/ceval.c
View File

@ -1142,11 +1142,40 @@ __NEXT_STEP:
DISPATCH();
}
case OP_EXCEPTION_MATCH: {
if(!py_checktype(TOP(), tp_type)) goto __ERROR;
bool ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
bool ok = false;
bool has_invalid = false;
if(TOP()->type == tp_type) {
ok = py_isinstance(&self->unhandled_exc, py_totype(TOP()));
} else if(TOP()->type == tp_tuple) {
int len = py_tuple_len(TOP());
py_ObjectRef data = py_tuple_data(TOP());
for(int i = 0; i < len; i++) {
if((data + i)->type != tp_type) {
has_invalid = true;
break;
}
}
if(!has_invalid) {
for(int i = 0; i < len; i++) {
if(py_isinstance(&self->unhandled_exc, py_totype(data + i))) {
ok = true;
break;
}
}
}
} else {
has_invalid = true;
}
if(has_invalid) {
py_clearexc(NULL);
TypeError("catching classes that do not inherit from BaseException is not allowed");
c11_vector__pop(&frame->exc_stack);
goto __ERROR_RE_RAISE;
} else {
py_newbool(TOP(), ok);
DISPATCH();
}
}
case OP_HANDLE_EXCEPTION: {
FrameExcInfo* info = Frame__top_exc_info(frame);
assert(info != NULL && py_isnil(&info->exc));

13
tests/280_exception.py
View File

@ -201,6 +201,19 @@ for i in range(6):
a.append(i)
assert a == [0, 1, 3, 4, 5]
try:
result = 10 / 0
except (ZeroDivisionError, TypeError) as e:
assert type(e) == ZeroDivisionError
try:
try:
result = 10 / 0
except (ZeroDivisionError, 1) as e:
assert type(e) == ZeroDivisionError
except Exception as e:
assert type(e) == TypeError
"""
# finally, only
def finally_only():