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

...

Browse Source
This commit is contained in:
blueloveTH 2023-05-25 13:50:54 +08:00
parent 313fffb269
commit 5e3293d5a5
3 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ceval.h
View File

@ -482,40 +482,10 @@ __NEXT_STEP:;
} }
DISPATCH(); DISPATCH();
/*****************************************/ /*****************************************/
TARGET(IMPORT_NAME) { TARGET(IMPORT_NAME)
StrName name(byte.arg); _name = StrName(byte.arg);
PyObject* ext_mod = _modules.try_get(name); PUSH(py_import(_name));
if(ext_mod == nullptr){ DISPATCH();
Str source;
auto it = _lazy_modules.find(name);
if(it == _lazy_modules.end()){
Bytes b = _read_file_cwd(fmt(name, ".py"));
if(!b) {
for(Str path: _path){
#ifdef _WIN32
const char* sep = "\\";
#else
const char* sep = "/";
#endif
b = _read_file_cwd(fmt(path, sep, name, ".py"));
if(b) break;
}
if(!b) _error("ImportError", fmt("module ", name.escape(), " not found"));
}
source = Str(b.str());
}else{
source = it->second;
_lazy_modules.erase(it);
}
CodeObject_ code = compile(source, Str(name.sv())+".py", EXEC_MODE);
PyObject* new_mod = new_module(name);
_exec(code, new_mod);
new_mod->attr()._try_perfect_rehash();
PUSH(new_mod);
}else{
PUSH(ext_mod);
}
} DISPATCH();
TARGET(IMPORT_STAR) TARGET(IMPORT_STAR)
_0 = POPX(); _0 = POPX();
for(auto& [name, value]: _0->attr().items()){ for(auto& [name, value]: _0->attr().items()){

4
src/pocketpy.h
View File

@ -104,6 +104,10 @@ inline void init_builtins(VM* _vm) {
return VAR_T(VoidP, obj); return VAR_T(VoidP, obj);
}); });
_vm->bind_builtin_func<1>("__import__", [](VM* vm, ArgsView args) {
return vm->py_import(CAST(Str&, args[0]));
});
_vm->bind_builtin_func<2>("divmod", [](VM* vm, ArgsView args) { _vm->bind_builtin_func<2>("divmod", [](VM* vm, ArgsView args) {
i64 lhs = CAST(i64, args[0]); i64 lhs = CAST(i64, args[0]);
i64 rhs = CAST(i64, args[1]); i64 rhs = CAST(i64, args[1]);

34
src/vm.h
View File

@ -548,6 +548,40 @@ public:
return _all_types[obj->type].obj; return _all_types[obj->type].obj;
} }
PyObject* py_import(StrName name){
PyObject* ext_mod = _modules.try_get(name);
if(ext_mod == nullptr){
Str source;
auto it = _lazy_modules.find(name);
if(it == _lazy_modules.end()){
Bytes b = _read_file_cwd(fmt(name, ".py"));
if(!b) {
for(Str path: _path){
#ifdef _WIN32
const char* sep = "\\";
#else
const char* sep = "/";
#endif
b = _read_file_cwd(fmt(path, sep, name, ".py"));
if(b) break;
}
if(!b) _error("ImportError", fmt("module ", name.escape(), " not found"));
}
source = Str(b.str());
}else{
source = it->second;
_lazy_modules.erase(it);
}
CodeObject_ code = compile(source, Str(name.sv())+".py", EXEC_MODE);
PyObject* new_mod = new_module(name);
_exec(code, new_mod);
new_mod->attr()._try_perfect_rehash();
return new_mod;
}else{
return ext_mod;
}
}
~VM() { ~VM() {
callstack.clear(); callstack.clear();
s_data.clear(); s_data.clear();