aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

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.
This commit is contained in:
Bram Moolenaar
2021-11-30 18:25:08 +00:00
parent ab36e6ae7b
commit eba3b7f664
5 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/userfunc.c
View File

@@ -3810,6 +3810,36 @@ untrans_function_name(char_u *name)
return NULL;
}
/*
* Call trans_function_name(), except that a lambda is returned as-is.
* Returns the name in allocated memory.
*/
char_u *
save_function_name(
char_u **name,
int *is_global,
int skip,
int flags,
funcdict_T *fudi)
{
char_u *p = *name;
char_u *saved;
if (STRNCMP(p, "<lambda>", 8) == 0)
{
p += 8;
(void)getdigits(&p);
saved = vim_strnsave(*name, p - *name);
if (fudi != NULL)
CLEAR_POINTER(fudi);
}
else
saved = trans_function_name(&p, is_global, skip,
flags, fudi, NULL, NULL);
*name = p;
return saved;
}
/*
* List functions. When "regmatch" is NULL all of then.
* Otherwise functions matching "regmatch".
@@ -3950,16 +3980,8 @@ define_function(exarg_T *eap, char_u *name_arg)
}
else
{
if (STRNCMP(p, "<lambda>", 8) == 0)
{
p += 8;
(void)getdigits(&p);
name = vim_strnsave(eap->arg, p - eap->arg);
CLEAR_FIELD(fudi);
}
else
name = trans_function_name(&p, &is_global, eap->skip,
TFN_NO_AUTOLOAD, &fudi, NULL, NULL);
name = save_function_name(&p, &is_global, eap->skip,
TFN_NO_AUTOLOAD, &fudi);
paren = (vim_strchr(p, '(') != NULL);
if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip)
{