diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-12-02 14:24:30 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-12-02 14:24:30 +0100 |
commit | ea87069d7814497181483877651aef6d97182120 (patch) | |
tree | 36b8be8ec54b0972a58b5fb634da18202fbcabb3 | |
parent | 38bd8de551225bfca133805f21cee2592f0c759d (diff) | |
download | vim-git-ea87069d7814497181483877651aef6d97182120.tar.gz |
patch 8.2.2080: Vim9: no proper error message for using s:var in for loopv8.2.2080
Problem: Vim9: no proper error message for using s:var in for loop.
Solution: Give a specific error.
-rw-r--r-- | src/testdir/test_vim9_script.vim | 21 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 6 |
3 files changed, 29 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 01396967f..e8778c8d4 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1884,6 +1884,27 @@ def Test_for_loop_fails() CheckDefFailure(['for i in range(3)', 'echo 3'], 'E170:') enddef +def Test_for_loop_script_var() + # cannot use s:var in a :def function + CheckDefFailure(['for s:var in range(3)', 'echo 3'], 'E1101:') + + # can use s:var in Vim9 script, with or without s: + var lines =<< trim END + vim9script + var total = 0 + for s:var in [1, 2, 3] + total += s:var + endfor + assert_equal(6, total) + + total = 0 + for var in [1, 2, 3] + total += var + endfor + assert_equal(6, total) + END +enddef + def Test_for_loop_unpack() var lines =<< trim END var result = [] diff --git a/src/version.c b/src/version.c index 3a2058112..e3d5b6eb9 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 */ /**/ + 2080, +/**/ 2079, /**/ 2078, diff --git a/src/vim9compile.c b/src/vim9compile.c index 07a22daa0..5b5f8f1af 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6617,6 +6617,12 @@ compile_for(char_u *arg_start, cctx_T *cctx) goto failed; } + if (STRNCMP(name, "s:", 2) == 0) + { + semsg(_(e_cannot_declare_script_variable_in_function), name); + goto failed; + } + // Reserve a variable to store "var". // TODO: check for type var_lvar = reserve_local(cctx, arg, varlen, FALSE, &t_any); |