mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-12 06:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.264

Browse Source 
Problem:  Can't define a function starting with "g:". Can't assign a
          funcref to a buffer-local variable.
Solution: Skip "g:" at the start of a function name.
          Don't check for colons when assigning to a variable.

https://code.google.com/p/vim/source/detail?r=00acac0af680c2d8c82db5258474b121a5908926
This commit is contained in:
Marco Hinz
2014-04-26 10:24:06 +02:00
committed by Thiago de Arruda
parent 4d0dd14189
commit 9b9c1dee13
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@@ -17302,7 +17302,6 @@ void ex_function(exarg_T *eap)
// Get the function name. There are these situations:
// func function name
// "name" == func, "fudi.fd_dict" == NULL
// s:func script-local function name
// dict.func new dictionary entry
// "name" == NULL, "fudi.fd_dict" set,
// "fudi.fd_di" == NULL, "fudi.fd_newkey" == func
@@ -17312,6 +17311,8 @@ void ex_function(exarg_T *eap)
// dict.func existing dict entry that's not a Funcref
// "name" == NULL, "fudi.fd_dict" set,
// "fudi.fd_di" set, "fudi.fd_newkey" == NULL
// s:func script-local function name
// g:func global function name, same as "func"
p = eap->arg;
name = trans_function_name(&p, eap->skip, 0, &fudi);
paren = (vim_strchr(p, '(') != NULL);
@@ -17917,8 +17918,10 @@ trans_function_name (
lead = 2;
}
} else {
if (lead == 2) /* skip over "s:" */
// Skip over "s:" and "g:".
if (lead == 2 || (lv.ll_name[0] == 'g' && lv.ll_name[1] == ':')) {
lv.ll_name += 2;
}
len = (int)(end - lv.ll_name);
}
@@ -17942,17 +17945,16 @@ trans_function_name (
lead += (int)STRLEN(sid_buf);
}
} else if (!(flags & TFN_INT) && builtin_function(lv.ll_name, len)) {
EMSG2(_(
"E128: Function name must start with a capital or \"s:\": %s"),
lv.ll_name);
EMSG2(_("E128: Function name must start with a capital or \"s:\": %s"),
start);
goto theend;
}
if (!skip) {
if (!skip && !(flags & TFN_QUIET)) {
char_u *cp = vim_strchr(lv.ll_name, ':');
if (cp != NULL && cp < end) {
EMSG2(_("E884: Function name cannot contain a colon: %s"), lv.ll_name);
EMSG2(_("E884: Function name cannot contain a colon: %s"), start);
goto theend;
}
}