To: vim_dev@googlegroups.com Subject: Patch 8.2.2002 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2002 Problem: Vim9: lambda argument shadowed by function name. Solution: Let function name be shadowed by lambda argument. (closes #7313) Files: src/vim9compile.c, src/testdir/test_vim9_func.vim *** ../vim-8.2.2001/src/vim9compile.c 2020-11-16 22:11:39.625599176 +0100 --- src/vim9compile.c 2020-11-17 18:44:26.340431930 +0100 *************** *** 2712,2724 **** goto theend; } ! // If we can find the function by name generate the right call. ! // Skip global functions here, a local funcref takes precedence. ! ufunc = find_func(name, FALSE, cctx); ! if (ufunc != NULL && !func_is_global(ufunc)) { ! res = generate_CALL(cctx, ufunc, argcount); ! goto theend; } // If the name is a variable, load it and use PCALL. --- 2712,2730 ---- goto theend; } ! // An argument or local variable can be a function reference, this ! // overrules a function name. ! if (lookup_local(namebuf, varlen, cctx) == NULL ! && arg_exists(namebuf, varlen, NULL, NULL, NULL, cctx) != OK) { ! // If we can find the function by name generate the right call. ! // Skip global functions here, a local funcref takes precedence. ! ufunc = find_func(name, FALSE, cctx); ! if (ufunc != NULL && !func_is_global(ufunc)) ! { ! res = generate_CALL(cctx, ufunc, argcount); ! goto theend; ! } } // If the name is a variable, load it and use PCALL. *** ../vim-8.2.2001/src/testdir/test_vim9_func.vim 2020-11-17 18:23:15.519278866 +0100 --- src/testdir/test_vim9_func.vim 2020-11-17 18:48:00.235954228 +0100 *************** *** 1456,1461 **** --- 1456,1470 ---- CheckScriptSuccess(lines) enddef + def Shadowed(): list + var FuncList: list = [{ -> 42}] + return FuncList->map({_, Shadowed -> Shadowed()}) + enddef + + def Test_lambda_arg_shadows_func() + assert_equal([42], Shadowed()) + enddef + def Line_continuation_in_def(dir: string = ''): string var path: string = empty(dir) \ ? 'empty' *** ../vim-8.2.2001/src/version.c 2020-11-17 18:23:15.519278866 +0100 --- src/version.c 2020-11-17 18:49:09.743797847 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2002, /**/ -- hundred-and-one symptoms of being an internet addict: 265. Your reason for not staying in touch with family is that they do not have e-mail addresses. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///