Mercurial > vim
changeset 24539:3a290891a015 v8.2.2809
patch 8.2.2809: Vim9: :def function compilation fails when using :legacy
Commit: https://github.com/vim/vim/commit/dc4c2309f2af347068edd60548269018f476dab9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 25 13:54:42 2021 +0200
patch 8.2.2809: Vim9: :def function compilation fails when using :legacy
Problem: Vim9: :def function compilation fails when using :legacy.
Solution: Reset CMOD_LEGACY when compiling a function. (closes https://github.com/vim/vim/issues/8137)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 25 Apr 2021 14:00:03 +0200 |
| parents | 93de24559a6f |
| children | e0bc78dd25ee |
| files | src/testdir/test_vim9_func.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -2167,10 +2167,20 @@ enddef def Test_legacy_lambda() legacy echo {x -> 'hello ' .. x}('foo') + var lines =<< trim END echo {x -> 'hello ' .. x}('foo') END CheckDefAndScriptFailure(lines, 'E720:') + + lines =<< trim END + vim9script + def Func() + echo (() => 'no error')() + enddef + legacy call s:Func() + END + CheckScriptSuccess(lines) enddef def DoFilterThis(a: string): list<string>
--- 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 */ /**/ + 2809, +/**/ 2808, /**/ 2807,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -8767,6 +8767,7 @@ compile_def_function( int ret = FAIL; sctx_T save_current_sctx = current_sctx; int save_estack_compiling = estack_compiling; + int save_cmod_flags = cmdmod.cmod_flags; int do_estack_push; int new_def_function = FALSE; #ifdef FEAT_PROFILE @@ -8811,6 +8812,9 @@ compile_def_function( current_sctx = ufunc->uf_script_ctx; current_sctx.sc_version = SCRIPT_VERSION_VIM9; + // Don't use the flag from ":legacy" here. + cmdmod.cmod_flags &= ~CMOD_LEGACY; + // Make sure error messages are OK. do_estack_push = !estack_top_is_ufunc(ufunc, 1); if (do_estack_push) @@ -9403,6 +9407,7 @@ erret: current_sctx = save_current_sctx; estack_compiling = save_estack_compiling; + cmdmod.cmod_flags = save_cmod_flags; if (do_estack_push) estack_pop();