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

fix py_exec and py_eval.

Browse Source
This commit is contained in:
ykiko 2024-06-18 19:49:30 +08:00
parent f9c00fd706
commit cc4dd34c86
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/vm.cpp
View File

@ -518,33 +518,34 @@ i64 VM::py_hash(PyVar obj){
} }
PyVar VM::__py_exec_internal(const CodeObject_& code, PyVar globals, PyVar locals){ PyVar VM::__py_exec_internal(const CodeObject_& code, PyVar globals, PyVar locals){
Frame* frame = &vm->callstack.top(); Frame* frame = nullptr;
if(!callstack.empty()) frame = &callstack.top();
// fast path // fast path
if(globals == vm->None && locals == vm->None){ if(frame && globals == vm->None && locals == vm->None) {
return vm->_exec(code.get(), frame->_module, frame->_callable, frame->_locals); return vm->_exec(code.get(), frame->_module, frame->_callable, frame->_locals);
} }
auto _lock = heap.gc_scope_lock(); // for safety auto _lock = heap.gc_scope_lock(); // for safety
PyVar globals_obj = nullptr; PyObject* globals_obj = nullptr;
Dict* globals_dict = nullptr; Dict* globals_dict = nullptr;
NameDict_ locals_closure = nullptr; NameDict_ locals_closure = nullptr;
Dict* locals_dict = nullptr; Dict* locals_dict = nullptr;
if(globals == vm->None){ if(globals == vm->None) {
globals_obj = frame->_module; globals_obj = frame ? frame->_module : _main;
}else{ } else {
if(is_type(globals, VM::tp_mappingproxy)){ if(is_type(globals, VM::tp_mappingproxy)) {
globals_obj = PK_OBJ_GET(MappingProxy, globals).obj; globals_obj = PK_OBJ_GET(MappingProxy, globals).obj;
}else{ } else {
check_compatible_type(globals, VM::tp_dict); check_compatible_type(globals, VM::tp_dict);
// make a temporary object and copy globals into it // make a temporary object and copy globals into it
globals_obj = heap.gcnew<DummyInstance>(VM::tp_object); globals_obj = heap.gcnew<DummyInstance>(VM::tp_object);
globals_obj->_enable_instance_dict(); globals_obj->_enable_instance_dict();
globals_dict = &PK_OBJ_GET(Dict, globals); globals_dict = &PK_OBJ_GET(Dict, globals);
globals_dict->apply([&](PyVar k, PyVar v){ globals_dict->apply([&](PyVar k, PyVar v) {
globals_obj->attr().set(CAST(Str&, k), v); globals_obj->attr().set(CAST(Str&, k), v);
}); });
} }
@ -552,29 +553,29 @@ PyVar VM::__py_exec_internal(const CodeObject_& code, PyVar globals, PyVar local
PyVar retval = nullptr; PyVar retval = nullptr;
if(locals == vm->None){ if(locals == vm->None) {
retval = vm->_exec(code, globals_obj); // only globals retval = vm->_exec(code, globals_obj); // only globals
}else{ } else {
check_compatible_type(locals, VM::tp_dict); check_compatible_type(locals, VM::tp_dict);
locals_dict = &PK_OBJ_GET(Dict, locals); locals_dict = &PK_OBJ_GET(Dict, locals);
locals_closure = std::make_shared<NameDict>(); locals_closure = std::make_shared<NameDict>();
locals_dict->apply([&](PyVar k, PyVar v){ locals_dict->apply([&](PyVar k, PyVar v) {
locals_closure->set(CAST(Str&, k), v); locals_closure->set(CAST(Str&, k), v);
}); });
PyVar _callable = VAR(Function(__dynamic_func_decl, globals_obj, nullptr, locals_closure)); PyObject* _callable = VAR(Function(__dynamic_func_decl, globals_obj, nullptr, locals_closure));
retval = vm->_exec(code.get(), globals_obj, _callable, vm->s_data._sp); retval = vm->_exec(code.get(), globals_obj, _callable, vm->s_data._sp);
} }
if(globals_dict){ if(globals_dict) {
globals_dict->clear(); globals_dict->clear();
globals_obj->attr().apply([&](StrName k, PyVar v){ globals_obj->attr().apply([&](StrName k, PyVar v) {
globals_dict->set(VAR(k.sv()), v); globals_dict->set(VAR(k.sv()), v);
}); });
} }
if(locals_dict){ if(locals_dict) {
locals_dict->clear(); locals_dict->clear();
locals_closure->apply([&](StrName k, PyVar v){ locals_closure->apply([&](StrName k, PyVar v) {
locals_dict->set(VAR(k.sv()), v); locals_dict->set(VAR(k.sv()), v);
}); });
} }