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

Update vm.h

Browse Source
This commit is contained in:
blueloveTH 2023-04-14 21:07:23 +08:00
parent 98b7a4506c
commit c7ec20a11e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vm.h
View File

@ -356,7 +356,7 @@ public:
inline PyObject* NativeFunc::operator()(VM* vm, Args& args) const{ inline PyObject* NativeFunc::operator()(VM* vm, Args& args) const{
int args_size = args.size() - (int)method; // remove self int args_size = args.size() - (int)method; // remove self
if(argc != -1 && args_size != argc) { if(argc != -1 && args_size != argc) {
vm->TypeError("expected " + std::to_string(argc) + " arguments, but got " + std::to_string(args_size)); vm->TypeError(fmt("expected ", argc, " arguments, but got ", args_size));
} }
return f(vm, args); return f(vm, args);
} }
@ -695,15 +695,12 @@ inline PyObject* VM::_py_call(PyObject* callable, ArgsView args, ArgsView kwargs
FastLocals locals(co); FastLocals locals(co);
int i = 0; int i = 0;
for(int index: fn.decl->args){ if(args.size() < fn.decl->args.size()){
if(i < args.size()){ vm->TypeError(fmt("expected ", fn.decl->args.size(), " positional arguments, but got ", args.size()));
locals[index] = args[i++];
}else{
StrName name = co->varnames[index];
TypeError(fmt("missing positional argument ", name.escape()));
}
} }
// prepare args
for(int index: fn.decl->args) locals[index] = args[i++];
// prepare kwdefaults // prepare kwdefaults
for(auto& kv: fn.decl->kwargs) locals[kv.key] = kv.value; for(auto& kv: fn.decl->kwargs) locals[kv.key] = kv.value;