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

Update vm.h

Browse Source 
Update vm.h
This commit is contained in:
blueloveTH 2023-04-09 18:21:13 +08:00
parent da760c301c
commit e936f349a0
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/vm.h
View File

@ -674,21 +674,6 @@ inline void VM::init_builtin_types(){
// TODO: callable/args here may be garbage collected accidentally // TODO: callable/args here may be garbage collected accidentally
inline PyObject* VM::call(PyObject* callable, Args args, const Args& kwargs, bool opCall){ inline PyObject* VM::call(PyObject* callable, Args args, const Args& kwargs, bool opCall){
if(is_type(callable, tp_type)){
PyObject* new_f = callable->attr().try_get(__new__);
PyObject* obj;
if(new_f != nullptr){
obj = call(new_f, std::move(args), kwargs, false);
}else{
obj = heap.gcnew<DummyInstance>(OBJ_GET(Type, callable), {});
PyObject* self;
PyObject* init_f = get_unbound_method(obj, __init__, &self, false);
args.extend_self(self);
if (self != _py_null) call(init_f, std::move(args), kwargs, false);
}
return obj;
}
if(is_type(callable, tp_bound_method)){ if(is_type(callable, tp_bound_method)){
auto& bm = CAST(BoundMethod&, callable); auto& bm = CAST(BoundMethod&, callable);
callable = bm.method; // get unbound method callable = bm.method; // get unbound method
@ -716,7 +701,9 @@ inline PyObject* VM::call(PyObject* callable, Args args, const Args& kwargs, boo
TypeError(fmt("missing positional argument ", name.escape())); TypeError(fmt("missing positional argument ", name.escape()));
} }
locals->update(fn.decl->kwargs); // NameDict.update is of O(capacity) complexity
// so we try not to call it if possible
if(fn.decl->kwargs.size()!=0) locals->update(fn.decl->kwargs);
if(!fn.decl->starred_arg.empty()){ if(!fn.decl->starred_arg.empty()){
List vargs; // handle *args List vargs; // handle *args
@ -748,6 +735,21 @@ inline PyObject* VM::call(PyObject* callable, Args args, const Args& kwargs, boo
return _exec(); return _exec();
} }
if(is_type(callable, tp_type)){
PyObject* new_f = callable->attr().try_get(__new__);
PyObject* obj;
if(new_f != nullptr){
obj = call(new_f, std::move(args), kwargs, false);
}else{
obj = heap.gcnew<DummyInstance>(OBJ_GET(Type, callable), {});
PyObject* self;
PyObject* init_f = get_unbound_method(obj, __init__, &self, false);
args.extend_self(self);
if (self != _py_null) call(init_f, std::move(args), kwargs, false);
}
return obj;
}
PyObject* self; PyObject* self;
PyObject* call_f = get_unbound_method(callable, __call__, &self, false); PyObject* call_f = get_unbound_method(callable, __call__, &self, false);
if(self != _py_null){ if(self != _py_null){