Mercurial > vim
changeset 25250:532faf893d37 v8.2.3161
patch 8.2.3161: Vim9: no error when reltime() has invalid arguments
Commit: https://github.com/vim/vim/commit/c816a2c22667108fcd61f445de2c926f78ff9fa7
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 14 21:00:41 2021 +0200
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 https://github.com/vim/vim/issues/8562)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 14 Jul 2021 21:15:03 +0200 |
parents | 9f8fefe5aabe |
children | 6024f64e0d2b |
files | src/testdir/test_vim9_builtin.vim src/time.c src/version.c |
diffstat | 3 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- a/src/time.c +++ b/src/time.c @@ -178,7 +178,11 @@ f_reltime(typval_T *argvars UNUSED, typv 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, typv // 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, # 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, t # 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 }