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

fix py_inspect_currentfunction

Browse Source
This commit is contained in:
blueloveTH 2024-08-18 12:54:37 +08:00
parent 8b0e1697c0
commit 2d5e515ae7
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pocketpy/interpreter/vm.h
View File

@ -51,7 +51,8 @@ typedef struct VM {
py_TValue reg[8]; // users' registers py_TValue reg[8]; // users' registers
py_TValue* __curr_class; py_StackRef __curr_class;
py_StackRef __curr_function;
py_TValue __vectorcall_buffer[PK_MAX_CO_VARNAMES]; py_TValue __vectorcall_buffer[PK_MAX_CO_VARNAMES];
ManagedHeap heap; ManagedHeap heap;

3
include/pocketpy/pocketpy.h
View File

@ -310,8 +310,9 @@ PK_EXPORT void py_setslot(py_Ref self, int i, py_Ref val);
/************* Inspection *************/ /************* Inspection *************/
/// Get the current `function` object from the stack. /// Get the current `function` object on the stack.
/// Return `NULL` if not available. /// Return `NULL` if not available.
/// NOTE: This function should be placed at the beginning of your decl-based bindings.
PK_EXPORT py_StackRef py_inspect_currentfunction(); PK_EXPORT py_StackRef py_inspect_currentfunction();
/// Get the current `module` object where the code is executed. /// Get the current `module` object where the code is executed.
/// Return `NULL` if not available. /// Return `NULL` if not available.

3
src/interpreter/vm.c
View File

@ -70,6 +70,7 @@ void VM__ctor(VM* self) {
self->is_curr_exc_handled = false; self->is_curr_exc_handled = false;
self->__curr_class = NULL; self->__curr_class = NULL;
self->__curr_function = NULL;
ManagedHeap__ctor(&self->heap, self); ManagedHeap__ctor(&self->heap, self);
ValueStack__ctor(&self->stack); ValueStack__ctor(&self->stack);
@ -445,8 +446,10 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
return opcall ? RES_CALL : VM__run_top_frame(self); return opcall ? RES_CALL : VM__run_top_frame(self);
} else { } else {
// decl-based binding // decl-based binding
self->__curr_function = p0;
bool ok = py_callcfunc(fn->cfunc, co->nlocals, argv); bool ok = py_callcfunc(fn->cfunc, co->nlocals, argv);
self->stack.sp = p0; self->stack.sp = p0;
self->__curr_function = NULL;
return ok ? RES_RETURN : RES_ERROR; return ok ? RES_RETURN : RES_ERROR;
} }
} }

1
src/public/py_exception.c
View File

@ -153,6 +153,7 @@ void py_clearexc(py_StackRef p0) {
vm->curr_exception = *py_NIL; vm->curr_exception = *py_NIL;
vm->is_curr_exc_handled = false; vm->is_curr_exc_handled = false;
vm->__curr_class = NULL; vm->__curr_class = NULL;
vm->__curr_function = NULL;
if(p0) vm->stack.sp = p0; if(p0) vm->stack.sp = p0;
} }

4
src/public/stack_ops.c
View File

@ -70,9 +70,7 @@ void py_setslot(py_Ref self, int i, py_Ref val) {
} }
py_StackRef py_inspect_currentfunction(){ py_StackRef py_inspect_currentfunction(){
Frame* frame = pk_current_vm->top_frame; return pk_current_vm->__curr_function;
if(!frame || !frame->has_function) return NULL;
return frame->p0;
} }
py_GlobalRef py_inspect_currentmodule(){ py_GlobalRef py_inspect_currentmodule(){