summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/evalfunc.c3
-rw-r--r--src/testdir/test_vim9_builtin.vim12
-rw-r--r--src/version.c2
3 files changed, 16 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 1fad082ac..f0a15f98c 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -435,6 +435,7 @@ arg_extend3(type_T *type, argcontext_T *context)
/*
* 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 arg1_float_or_nr[] = {arg_float_or_nr};
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},
{"state", 0, 1, FEARG_1, NULL,
ret_string, f_state},
- {"str2float", 1, 1, FEARG_1, NULL,
+ {"str2float", 1, 1, FEARG_1, arg1_string,
ret_float, FLOAT_FUNC(f_str2float)},
{"str2list", 1, 2, FEARG_1, NULL,
ret_list_number, f_str2list},
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index e7bec71c8..5fd510f57 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -916,6 +916,18 @@ def Test_split()
split(' aa bb ', '\W\+', true)->assert_equal(['', 'aa', 'bb', ''])
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()
str2nr("1'000'000", 10, true)->assert_equal(1000000)
diff --git a/src/version.c b/src/version.c
index d802f9c91..b3d4feffd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2443,
+/**/
2442,
/**/
2441,