Mercurial > vim
changeset 23052:9775df18916b v8.2.2072
patch 8.2.2072: Vim9: list assign not well tested
Commit: https://github.com/vim/vim/commit/004d9b00ba600a167746ad7af88e0baa77c95d8f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 30 21:40:03 2020 +0100
patch 8.2.2072: Vim9: list assign not well tested
Problem: Vim9: list assign not well tested.
Solution: Test with different destinations. Fix white space error.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 30 Nov 2020 21:45:04 +0100 |
| parents | 4f0a99b7b4cb |
| children | db8554aa3c92 |
| files | src/testdir/test_vim9_assign.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 29 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -657,6 +657,24 @@ def Test_assignment_var_list() assert_equal(3, &ts) assert_equal(4, &sw) set ts=8 sw=4 + + [@a, @z] = ['aa', 'zz'] + assert_equal('aa', @a) + assert_equal('zz', @z) + + [$SOME_VAR, $OTHER_VAR] = ['some', 'other'] + assert_equal('some', $SOME_VAR) + assert_equal('other', $OTHER_VAR) + + [g:globalvar, s:scriptvar, b:bufvar, w:winvar, t:tabvar, v:errmsg] = + ['global', 'script', 'buf', 'win', 'tab', 'error'] + assert_equal('global', g:globalvar) + assert_equal('script', s:scriptvar) + assert_equal('buf', b:bufvar) + assert_equal('win', w:winvar) + assert_equal('tab', t:tabvar) + assert_equal('error', v:errmsg) + unlet g:globalvar END CheckDefAndScriptSuccess(lines) enddef
--- 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 */ /**/ + 2072, +/**/ 2071, /**/ 2070,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5123,7 +5123,7 @@ compile_assignment(char_u *arg, exarg_T // can be something like "[1, 2]->func()" return arg; - if (oplen > 0 && (!VIM_ISWHITE(*sp) || !VIM_ISWHITE(op[oplen]))) + if (oplen > 0 && (!VIM_ISWHITE(*sp) || !IS_WHITE_OR_NUL(op[oplen]))) { error_white_both(op, oplen); return NULL; @@ -5159,10 +5159,16 @@ compile_assignment(char_u *arg, exarg_T } else if (var_count > 0) { + char_u *wp; + // for "[var, var] = expr" evaluate the expression here, loop over the // list of variables below. - - p = skipwhite(op + oplen); + // A line break may follow the "=". + + wp = op + oplen; + p = skipwhite(wp); + if (may_get_next_line(wp, &p, cctx) == FAIL) + return FAIL; if (compile_expr0(&p, cctx) == FAIL) return NULL; end = p;