aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0627: Python cannot handle function name of script-local function

Browse Source 
Problem:    Python cannot handle function name of script-local function.
Solution:   Use <SNR> instead of the special byte code. (Ozaki Kiichi, closes
            #3681)
This commit is contained in:
Bram Moolenaar
2018-12-22 18:59:06 +01:00
parent 4814ccbdf0
commit 9123c0b31a
4 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/if_py_both.h
View File

@@ -2922,8 +2922,7 @@ FunctionNew(PyTypeObject *subtype, char_u *name, int argc, typval_T *argv,
{
FunctionObject *self;
self = (FunctionObject *) subtype->tp_alloc(subtype, 0);
self = (FunctionObject *)subtype->tp_alloc(subtype, 0);
if (self == NULL)
return NULL;
@@ -2938,15 +2937,36 @@ FunctionNew(PyTypeObject *subtype, char_u *name, int argc, typval_T *argv,
self->name = vim_strsave(name);
}
else
if ((self->name = get_expanded_name(name,
vim_strchr(name, AUTOLOAD_CHAR) == NULL))
== NULL)
{
char_u *p;
if ((p = get_expanded_name(name,
vim_strchr(name, AUTOLOAD_CHAR) == NULL)) == NULL)
{
PyErr_FORMAT(PyExc_ValueError,
N_("function %s does not exist"), name);
return NULL;
}
if (p[0] == K_SPECIAL && p[1] == KS_EXTRA && p[2] == (int)KE_SNR)
{
char_u *np;
size_t len = STRLEN(p) + 1;
if ((np = alloc(len + 2)) == NULL)
{
vim_free(p);
return NULL;
}
mch_memmove(np, "<SNR>", 5);
mch_memmove(np + 5, p + 3, len - 3);
vim_free(p);
self->name = np;
}
else
self->name = p;
}
func_ref(self->name);
self->argc = argc;
self->argv = argv;