Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-15 17:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix kw to pos

Browse Source
This commit is contained in:
pikastech 2022-11-28 17:12:50 +08:00
parent a3a444ce4f
commit 9d9d463120
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
port/linux/.vscode/launch.json vendored
View File

@ -11,7 +11,7 @@
"program": "${workspaceFolder}/build/test/pikascript_test",
// "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain",
"args": [
// "--gtest_filter=pikaMain.slice_a90"
"--gtest_filter=vm.fn_pos_kw2"
],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",

34
src/PikaVM.c
View File

@ -870,11 +870,23 @@ char* _kw_to_default(char* type_list,
return arg_name;
}
void _kw_to_pos(char* type_list,
PikaDict* kw,
int* argc,
Arg* argv[],
int arg_num_need) {
int _kw_to_pos_one(char* arg_name, PikaDict* kw, int* argc, Arg* argv[]) {
if (kw == NULL) {
return 0;
}
Arg* pos_arg = pikaDict_getArg(kw, arg_name);
if (pos_arg == NULL) {
return 0;
}
argv[(*argc)++] = arg_copy(pos_arg);
return 1;
}
void _kw_to_pos_all(char* type_list,
PikaDict* kw,
int* argc,
Arg* argv[],
int arg_num_need) {
if (0 == arg_num_need) {
return;
}
@ -1117,6 +1129,15 @@ static int VMState_loadArgsFromMethodArg(VMState* vm,
/* load default from kw */
arg_name = _kw_to_default(type_list, arg_name, kw_dict, &argc, argv);
/* load position arg */
if (_kw_to_pos_one(arg_name, kw_dict, &argc, argv)) {
/* load pos from kw */
arg_num_pos_got++;
/* restore the stack */
i--;
stack_pushArg(&(vm->stack), call_arg);
continue;
}
/*load pos from pos */
arg_setNameHash(call_arg, hash_time33EndWith(arg_name, ':'));
argv[argc++] = call_arg;
arg_num_pos_got++;
@ -1129,7 +1150,8 @@ static int VMState_loadArgsFromMethodArg(VMState* vm,
_kw_to_default(type_list, arg_name, kw_dict, &argc, argv);
}
/* load kw to pos */
_kw_to_pos(type_list, kw_dict, &argc, argv, arg_num_pos - arg_num_pos_got);
_kw_to_pos_all(type_list, kw_dict, &argc, argv,
arg_num_pos - arg_num_pos_got);
#endif
if (tuple != NULL) {

20
test/VM-test.cpp
View File

@ -2302,6 +2302,26 @@ TEST(vm, fn_pos_kw) {
obj_deinit(pikaMain);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(vm, fn_pos_kw2) {
/* init */
pikaMemInfo.heapUsedMax = 0;
PikaObj* pikaMain = newRootObj("pikaMain", New_PikaMain);
/* run */
__platform_printf("BEGIN\r\n");
obj_run(pikaMain,
"def test(a, b):\n"
" print(a, b)\n"
"test(1, b=2)\n"
"test(1, a=2)\n");
/* collect */
/* assert */
EXPECT_STREQ(log_buff[1], "1 2\r\n");
EXPECT_STREQ(log_buff[0], "2 1\r\n");
/* deinit */
obj_deinit(pikaMain);
EXPECT_EQ(pikaMemNow(), 0);
}
#endif
TEST_END