mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.2.2443: Vim9: no compile time error for wrong str2float argument
Problem: Vim9: no compile time error for wrong str2float argument. Solution: Check argument type. (closes #7759)
This commit is contained in:
@@ -435,6 +435,7 @@ arg_extend3(type_T *type, argcontext_T *context)
|
|||||||
/*
|
/*
|
||||||
* Lists of functions that check the argument types of a builtin function.
|
* Lists of functions that check the argument types of a builtin function.
|
||||||
*/
|
*/
|
||||||
|
argcheck_T arg1_string[] = {arg_string};
|
||||||
argcheck_T arg3_string_nr_bool[] = {arg_string, arg_number, arg_bool};
|
argcheck_T arg3_string_nr_bool[] = {arg_string, arg_number, arg_bool};
|
||||||
argcheck_T arg1_float_or_nr[] = {arg_float_or_nr};
|
argcheck_T arg1_float_or_nr[] = {arg_float_or_nr};
|
||||||
argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev};
|
argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev};
|
||||||
@@ -1561,7 +1562,7 @@ static funcentry_T global_functions[] =
|
|||||||
ret_list_number, f_srand},
|
ret_list_number, f_srand},
|
||||||
{"state", 0, 1, FEARG_1, NULL,
|
{"state", 0, 1, FEARG_1, NULL,
|
||||||
ret_string, f_state},
|
ret_string, f_state},
|
||||||
{"str2float", 1, 1, FEARG_1, NULL,
|
{"str2float", 1, 1, FEARG_1, arg1_string,
|
||||||
ret_float, FLOAT_FUNC(f_str2float)},
|
ret_float, FLOAT_FUNC(f_str2float)},
|
||||||
{"str2list", 1, 2, FEARG_1, NULL,
|
{"str2list", 1, 2, FEARG_1, NULL,
|
||||||
ret_list_number, f_str2list},
|
ret_list_number, f_str2list},
|
||||||
|
@@ -916,6 +916,18 @@ def Test_split()
|
|||||||
split(' aa bb ', '\W\+', true)->assert_equal(['', 'aa', 'bb', ''])
|
split(' aa bb ', '\W\+', true)->assert_equal(['', 'aa', 'bb', ''])
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
|
def Run_str2float()
|
||||||
|
if !has('float')
|
||||||
|
MissingFeature 'float'
|
||||||
|
endif
|
||||||
|
str2float("1.00")->assert_equal(1.00)
|
||||||
|
str2float("2e-2")->assert_equal(0.02)
|
||||||
|
|
||||||
|
CheckDefFailure(['echo str2float(123)'], 'E1013:')
|
||||||
|
CheckScriptFailure(['vim9script', 'echo str2float(123)'], 'E1024:')
|
||||||
|
endif
|
||||||
|
enddef
|
||||||
|
|
||||||
def Test_str2nr()
|
def Test_str2nr()
|
||||||
str2nr("1'000'000", 10, true)->assert_equal(1000000)
|
str2nr("1'000'000", 10, true)->assert_equal(1000000)
|
||||||
|
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
2443,
|
||||||
/**/
|
/**/
|
||||||
2442,
|
2442,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user