aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.2.2942: Vim9: error when calling function with too few arguments

Browse Source 
Problem:    Vim9: internal error when calling function with too few arguments
Solution:   Check for argument count to be too few. (closes #8325)
This commit is contained in:
Bram Moolenaar
2021-06-05 18:15:09 +02:00
parent b288ba9f1d
commit 8da6d6db34
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/errors.h
View File

@@ -419,3 +419,7 @@ EXTERN char e_cannot_open_terminal_from_command_line_window[]
INIT(= N_("E1188: Cannot open a terminal from the command line window")); INIT(= N_("E1188: Cannot open a terminal from the command line window"));
EXTERN char e_cannot_use_legacy_with_command_str[] EXTERN char e_cannot_use_legacy_with_command_str[]
INIT(= N_("E1189: Cannot use :legacy with this command: %s")); INIT(= N_("E1189: Cannot use :legacy with this command: %s"));
EXTERN char e_one_argument_too_few[]
INIT(= N_("E1190: One argument too few"));
EXTERN char e_nr_arguments_too_few[]
INIT(= N_("E1190: %d arguments too few"));

9
src/testdir/test_vim9_builtin.vim
View File

@@ -810,6 +810,15 @@ def Test_map_function_arg()
assert_equal(['0:a', '1:b', '2:c'], l) assert_equal(['0:a', '1:b', '2:c'], l)
END END
CheckDefAndScriptSuccess(lines) CheckDefAndScriptSuccess(lines)
lines =<< trim END
range(3)->map((a, b, c) => a + b + c)
END
CheckDefExecAndScriptFailure(lines, 'E1190: One argument too few')
lines =<< trim END
range(3)->map((a, b, c, d) => a + b + c + d)
END
CheckDefExecAndScriptFailure(lines, 'E1190: 2 arguments too few')
enddef enddef
def Test_map_item_type() def Test_map_item_type()

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2942,
/**/ /**/
2941, 2941,
/**/ /**/

8
src/vim9execute.c
View File

@@ -4234,6 +4234,14 @@ call_def_function(
semsg(_(e_nr_arguments_too_many), idx); semsg(_(e_nr_arguments_too_many), idx);
goto failed_early; goto failed_early;
} }
else if (idx < 0)
{
if (idx == -1)
emsg(_(e_one_argument_too_few));
else
semsg(_(e_nr_arguments_too_few), -idx);
goto failed_early;
}
// Put arguments on the stack, but no more than what the function expects. // Put arguments on the stack, but no more than what the function expects.
// A lambda can be called with more arguments than it uses. // A lambda can be called with more arguments than it uses.