Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-19 19:10:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug of super

Browse Source
This commit is contained in:
blueloveTH 2024-12-04 23:34:04 +08:00
parent 34d09da688
commit c7935564c3
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/interpreter/ceval.c
View File

@ -60,7 +60,7 @@ static bool stack_format_object(VM* self, c11_sv spec);
case RES_RETURN: PUSH(&self->last_retval); break; \
case RES_CALL: frame = self->top_frame; goto __NEXT_FRAME; \
case RES_ERROR: goto __ERROR; \
default: c11__unreachable(); \
default: c11__unreachable(); \
} \
} while(0)
@ -974,8 +974,13 @@ FrameResult VM__run_top_frame(VM* self) {
case OP_STORE_CLASS_ATTR: {
assert(self->__curr_class);
py_Name name = byte.arg;
if(py_istype(TOP(), tp_function)) {
Function* ud = py_touserdata(TOP());
// TOP() can be a function, classmethod or custom decorator
py_Ref actual_func = TOP();
if(actual_func->type == tp_classmethod) {
actual_func = py_getslot(actual_func, 0);
}
if(actual_func->type == tp_function) {
Function* ud = py_touserdata(actual_func);
ud->clazz = self->__curr_class->_obj;
}
py_setdict(self->__curr_class, name, TOP());

12
src/public/modules.c
View File

@ -763,9 +763,15 @@ static bool super__new__(int argc, py_Ref argv) {
if(argc == 1) {
// super()
if(frame->has_function) {
Function* func = py_touserdata(frame->p0);
*class_arg = *(py_Type*)PyObject__userdata(func->clazz);
if(frame->co->nlocals > 0) self_arg = &frame->locals[0];
py_TValue* callable = frame->p0;
if(callable->type == tp_boundmethod) callable = py_getslot(frame->p0, 1);
if(callable->type == tp_function) {
Function* func = py_touserdata(callable);
if(func->clazz != NULL) {
*class_arg = *(py_Type*)PyObject__userdata(func->clazz);
if(frame->co->nlocals > 0) self_arg = &frame->locals[0];
}
}
}
if(class_arg == 0 || self_arg == NULL) return RuntimeError("super(): no arguments");
} else if(argc == 3) {

14
tests/41_class_ex.py
View File

@ -154,3 +154,17 @@ assert B.static_method(123) == 123
assert B.class_method('123') == 'B123'
assert B().static_method(123) == 123
assert B().class_method('123') == 'B123'
# test super() with classmethod
class BaseClass:
@classmethod
def f(cls):
return 'BaseClass'
class DerivedClass(BaseClass):
@classmethod
def f(cls):
return super().f()
assert DerivedClass.f() == 'BaseClass'