Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2026-03-21 20:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve py_inspect_currentfunction

Browse Source
This commit is contained in:
blueloveTH 2026-03-13 22:05:52 +08:00
parent 35917fc5f4
commit cf70668a2f
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,8 @@ typedef struct VM {
CachedNames cached_names;
py_StackRef curr_class;
py_StackRef curr_decl_based_function; // this is for get current function without frame
py_StackRef curr_function;
TraceInfo trace_info;
WatchdogInfo watchdog_info;
LineProfiler line_profiler;

4
include/pocketpy/pocketpy.h
View File

@ -391,9 +391,9 @@ PK_API void py_tphookattributes(py_Type type,
/************* Inspection *************/
/// Get the current `function` object on the stack.
/// Get the current `Callable` object on the stack of the most recent vectorcall.
/// Return `NULL` if not available.
/// NOTE: This function should be placed at the beginning of your decl-based bindings.
/// NOTE: This function should be placed at the beginning of your bindings or you will get wrong result.
PK_API py_StackRef py_inspect_currentfunction();
/// Get the current `module` object where the code is executed.
/// Return `NULL` if not available.

2
src/interpreter/ceval.c
View File

@ -1244,7 +1244,7 @@ __ERROR:
__ERROR_RE_RAISE:
do {
self->curr_class = NULL;
self->curr_decl_based_function = NULL;
self->curr_function = NULL;
} while(0);
int target = Frame__goto_exception_handler(frame, &self->stack, &self->unhandled_exc);

14
src/interpreter/vm.c
View File

@ -103,7 +103,8 @@ void VM__ctor(VM* self) {
self->ctx = NULL;
self->curr_class = NULL;
self->curr_decl_based_function = NULL;
self->curr_function = NULL;
memset(&self->trace_info, 0, sizeof(TraceInfo));
memset(&self->watchdog_info, 0, sizeof(WatchdogInfo));
LineProfiler__ctor(&self->line_profiler);
@ -482,8 +483,8 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
}
#endif
py_Ref p1 = self->stack.sp - kwargc * 2;
py_Ref p0 = p1 - argc - 2;
py_StackRef p1 = self->stack.sp - kwargc * 2;
py_StackRef p0 = p1 - argc - 2;
// [callable, <self>, args..., kwargs...]
// ^p0 ^p1 ^_sp
@ -496,7 +497,8 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
// [unbound, self, args..., kwargs...]
}
py_Ref argv = p0 + 1 + (int)py_isnil(p0 + 1);
py_StackRef argv = p0 + 1 + (int)py_isnil(p0 + 1);
self->curr_function = p0; // set current function for inspection
if(p0->type == tp_function) {
Function* fn = py_touserdata(p0);
@ -516,10 +518,8 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
return opcall ? RES_CALL : VM__run_top_frame(self);
} else {
// decl-based binding
self->curr_decl_based_function = p0;
bool ok = py_callcfunc(fn->cfunc, co->nlocals, argv);
self->stack.sp = p0;
self->curr_decl_based_function = NULL;
return ok ? RES_RETURN : RES_ERROR;
}
}
@ -545,10 +545,8 @@ FrameResult VM__vectorcall(VM* self, uint16_t argc, uint16_t kwargc, bool opcall
return opcall ? RES_CALL : VM__run_top_frame(self);
} else {
// decl-based binding
self->curr_decl_based_function = p0;
bool ok = py_callcfunc(fn->cfunc, co->nlocals, argv);
self->stack.sp = p0;
self->curr_decl_based_function = NULL;
return ok ? RES_RETURN : RES_ERROR;
}
case FuncType_GENERATOR: {

6
src/public/Inspection.c
View File

@ -3,10 +3,8 @@
py_StackRef py_inspect_currentfunction() {
VM* vm = pk_current_vm;
if(vm->curr_decl_based_function) return vm->curr_decl_based_function;
py_Frame* frame = vm->top_frame;
if(!frame || frame->is_locals_special) return NULL;
return frame->p0;
if(vm->curr_function >= vm->stack.sp) return NULL;
return vm->curr_function;
}
py_GlobalRef py_inspect_currentmodule() {