IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3705: cannot pass a lambda name to function() or funcref()

Browse Source 
Problem:    Cannot pass a lambda name to function() or funcref(). (Yegappan
            Lakshmanan)
Solution:   Handle a lambda name differently.

eba3b7f664

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2022-11-05 15:30:54 +08:00
parent 900dd2bdab
commit b3e9010f47
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

@ -5029,9 +5029,8 @@ void common_function(typval_T *argvars, typval_T *rettv, bool is_funcref)
if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref) { if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref) {
name = s; name = s;
trans_name = (char *)trans_function_name(&name, false, trans_name = save_function_name(&name, false,
TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD | TFN_NO_DEREF, NULL);
| TFN_NO_DEREF, NULL, NULL);
if (*name != NUL) { if (*name != NUL) {
s = NULL; s = NULL;
} }

30
src/nvim/eval/userfunc.c
View File

@ -1886,6 +1886,27 @@ theend:
return (char_u *)name; return (char_u *)name;
} }
/// Call trans_function_name(), except that a lambda is returned as-is.
/// Returns the name in allocated memory.
char *save_function_name(char **name, bool skip, int flags, funcdict_T *fudi)
{
char *p = *name;
char *saved;
if (strncmp(p, "<lambda>", 8) == 0) {
p += 8;
(void)getdigits(&p, false, 0);
saved = xstrndup(*name, (size_t)(p - *name));
if (fudi != NULL) {
CLEAR_POINTER(fudi);
}
} else {
saved = (char *)trans_function_name(&p, skip, flags, fudi, NULL);
}
*name = p;
return saved;
}
#define MAX_FUNC_NESTING 50 #define MAX_FUNC_NESTING 50
/// List functions. /// List functions.
@ -2000,14 +2021,7 @@ void ex_function(exarg_T *eap)
// s:func script-local function name // s:func script-local function name
// g:func global function name, same as "func" // g:func global function name, same as "func"
p = eap->arg; p = eap->arg;
if (strncmp(p, "<lambda>", 8) == 0) { name = save_function_name(&p, eap->skip, TFN_NO_AUTOLOAD, &fudi);
p += 8;
(void)getdigits(&p, false, 0);
name = xstrndup(eap->arg, (size_t)(p - eap->arg));
CLEAR_FIELD(fudi);
} else {
name = (char *)trans_function_name(&p, eap->skip, TFN_NO_AUTOLOAD, &fudi, NULL);
}
paren = (vim_strchr(p, '(') != NULL); paren = (vim_strchr(p, '(') != NULL);
if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip) { if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip) {
// Return on an invalid expression in braces, unless the expression // Return on an invalid expression in braces, unless the expression

7
src/nvim/testdir/test_expr.vim
View File

@ -496,6 +496,13 @@ func Test_function_with_funcref()
call assert_fails("call function('foo()')", 'E475:') call assert_fails("call function('foo()')", 'E475:')
call assert_fails("call function('foo()')", 'foo()') call assert_fails("call function('foo()')", 'foo()')
call assert_fails("function('')", 'E129:') call assert_fails("function('')", 'E129:')
let Len = {s -> strlen(s)}
call assert_equal(6, Len('foobar'))
let name = string(Len)
" can evaluate "function('<lambda>99')"
call execute('let Ref = ' .. name)
call assert_equal(4, Ref('text'))
endfunc endfunc
func Test_funcref() func Test_funcref()