Mercurial > vim
changeset 21620:46956b6811a1 v8.2.1360
patch 8.2.1360: stray error for white space after expression
Commit: https://github.com/vim/vim/commit/f96e9dec636d7d105b015680d8c5d6b47d936e01
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 3 22:39:28 2020 +0200
patch 8.2.1360: stray error for white space after expression
Problem: Stray error for white space after expression.
Solution: Ignore trailing white space. (closes https://github.com/vim/vim/issues/6608)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 03 Aug 2020 22:45:07 +0200 |
| parents | aae35544194c |
| children | 1ff1931aa192 |
| files | src/eval.c src/testdir/test_filter_map.vim src/version.c |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -300,7 +300,7 @@ eval_expr_typval(typval_T *expr, typval_ s = skipwhite(s); if (eval1_emsg(&s, rettv, NULL) == FAIL) return FAIL; - if (*s != NUL) // check for trailing chars after expr + if (*skipwhite(s) != NUL) // check for trailing chars after expr { clear_tv(rettv); semsg(_(e_invexpr2), s);
--- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -11,6 +11,7 @@ func Test_filter_map_list_expr_string() call assert_equal([2, 4, 6, 8], map([1, 2, 3, 4], 'v:val * 2')) call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], 'v:key * 2')) call assert_equal([9, 9, 9, 9], map([1, 2, 3, 4], 9)) + call assert_equal([7, 7, 7], map([1, 2, 3], ' 7 ')) endfunc " dict with expression string