patch 8.2.3161: Vim9: no error when reltime() has invalid arguments

Problem:    Vim9: no error when reltime() has invalid arguments.
Solution:   Add an error. (closes #8562)

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 03bc3fbe30b213544ef3ed5cf30b108dbd81e809..f5315f91f160179075383e68c84644608f4c32b4 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -1652,6 +1652,11 @@ def Test_readfile()
 enddef
 
 def Test_reltime()
+  CheckFeature reltime
+
+  CheckDefExecAndScriptFailure(['[]->reltime()'], 'E474:')
+  CheckDefExecAndScriptFailure(['[]->reltime([])'], 'E474:')
+
   CheckDefFailure(['reltime("x")'], 'E1013: Argument 1: type mismatch, expected list<number> but got string')
   CheckDefFailure(['reltime(["x", "y"])'], 'E1013: Argument 1: type mismatch, expected list<number> but got list<string>')
   CheckDefFailure(['reltime([1, 2], 10)'], 'E1013: Argument 2: type mismatch, expected list<number> but got number')
@@ -1663,12 +1668,20 @@ def Test_reltime()
 enddef
 
 def Test_reltimefloat()
+  CheckFeature reltime
+
+  CheckDefExecAndScriptFailure(['[]->reltimefloat()'], 'E474:')
+
   CheckDefFailure(['reltimefloat("x")'], 'E1013: Argument 1: type mismatch, expected list<number> but got string')
   CheckDefFailure(['reltimefloat([1.1])'], 'E1013: Argument 1: type mismatch, expected list<number> but got list<float>')
   assert_true(type(reltimefloat(reltime())) == v:t_float)
 enddef
 
 def Test_reltimestr()
+  CheckFeature reltime
+
+  CheckDefExecAndScriptFailure(['[]->reltimestr()'], 'E474:')
+
   CheckDefFailure(['reltimestr(true)'], 'E1013: Argument 1: type mismatch, expected list<number> but got bool')
   CheckDefFailure(['reltimestr([true])'], 'E1013: Argument 1: type mismatch, expected list<number> but got list<bool>')
   assert_true(type(reltimestr(reltime())) == v:t_string)

diff --git a/src/time.c b/src/time.c
index 6d4ad5d51eacd5a803a5a07384dfd1d0f2a2ddbf..02c5da9dd1c406a944561c6def0922f3ddc5d885 100644 (file)
--- a/src/time.c
+++ b/src/time.c
@@ -178,7 +178,11 @@ f_reltime(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
     else if (argvars[1].v_type == VAR_UNKNOWN)
     {
        if (list2proftime(&argvars[0], &res) == FAIL)
+       {
+           if (in_vim9script())
+               emsg(_(e_invarg));
            return;
+       }
        profile_end(&res);
     }
     else
@@ -186,7 +190,11 @@ f_reltime(typval_T *argvars UNUSED, typval_T *rettv UNUSED)
        // Two arguments: compute the difference.
        if (list2proftime(&argvars[0], &start) == FAIL
                || list2proftime(&argvars[1], &res) == FAIL)
+       {
+           if (in_vim9script())
+               emsg(_(e_invarg));
            return;
+       }
        profile_sub(&res, &start);
     }
 
@@ -223,6 +231,8 @@ f_reltimefloat(typval_T *argvars UNUSED, typval_T *rettv)
 #  ifdef FEAT_RELTIME
     if (list2proftime(&argvars[0], &tm) == OK)
        rettv->vval.v_float = profile_float(&tm);
+    else if (in_vim9script())
+       emsg(_(e_invarg));
 #  endif
 }
 # endif
@@ -242,6 +252,8 @@ f_reltimestr(typval_T *argvars UNUSED, typval_T *rettv)
 # ifdef FEAT_RELTIME
     if (list2proftime(&argvars[0], &tm) == OK)
        rettv->vval.v_string = vim_strsave((char_u *)profile_msg(&tm));
+    else if (in_vim9script())
+       emsg(_(e_invarg));
 # endif
 }
 

diff --git a/src/version.c b/src/version.c
index e20a32c61284007d6af718424aa7619f5b635cf7..7e3455d907a308beb85663c6ebbc5c1a45422704 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3161,
 /**/
     3160,
 /**/