mirror of
https://gitee.com/Lyon1998/pikapython.git
synced 2025-01-29 17:22:56 +08:00
fix n_used
restore test
This commit is contained in:
parent
abbe038eb3
commit
30bc567bd6
2
port/linux/.vscode/launch.json
vendored
2
port/linux/.vscode/launch.json
vendored
@ -11,7 +11,7 @@
|
|||||||
"program": "${workspaceFolder}/build/test/pikascript_test",
|
"program": "${workspaceFolder}/build/test/pikascript_test",
|
||||||
// "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain",
|
// "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain",
|
||||||
"args": [
|
"args": [
|
||||||
// "--gtest_filter=vm.ui_page"
|
"--gtest_filter=network.config"
|
||||||
],
|
],
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"cwd": "${workspaceFolder}",
|
"cwd": "${workspaceFolder}",
|
||||||
|
@ -1132,11 +1132,11 @@ static void _load_call_arg(VMState* vm,
|
|||||||
(f->n_positional_got)++;
|
(f->n_positional_got)++;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int _get_n_input_with_unpack(VMState* vm) {
|
static int _get_n_input_with_unpack(VMState* vm, int n_used) {
|
||||||
#if PIKA_NANO_ENABLE
|
#if PIKA_NANO_ENABLE
|
||||||
return VMState_getInputArgNum(vm);
|
return VMState_getInputArgNum(vm);
|
||||||
#else
|
#else
|
||||||
int n_input = VMState_getInputArgNum(vm);
|
int n_input = VMState_getInputArgNum(vm) - n_used;
|
||||||
int get_star = 0;
|
int get_star = 0;
|
||||||
int unpack_num = 0;
|
int unpack_num = 0;
|
||||||
for (int i = 0; i < n_input; i++) {
|
for (int i = 0; i < n_input; i++) {
|
||||||
@ -1268,7 +1268,7 @@ static int VMState_loadArgsFromMethodArg(VMState* vm,
|
|||||||
f.n_positional--;
|
f.n_positional--;
|
||||||
}
|
}
|
||||||
|
|
||||||
f.n_input = _get_n_input_with_unpack(vm);
|
f.n_input = _get_n_input_with_unpack(vm, n_used);
|
||||||
|
|
||||||
/* check arg num */
|
/* check arg num */
|
||||||
if (f.method_type == ARG_TYPE_METHOD_NATIVE_CONSTRUCTOR ||
|
if (f.method_type == ARG_TYPE_METHOD_NATIVE_CONSTRUCTOR ||
|
||||||
@ -1306,7 +1306,7 @@ static int VMState_loadArgsFromMethodArg(VMState* vm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (vars_or_keys_or_default) {
|
if (vars_or_keys_or_default) {
|
||||||
f.n_arg = f.n_input - n_used;
|
f.n_arg = f.n_input;
|
||||||
} else {
|
} else {
|
||||||
f.n_arg = f.n_positional;
|
f.n_arg = f.n_positional;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user