kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1586

Browse Source 
Problem:    Nesting partials doesn't work.
Solution:   Append arguments. (Ken Takata)

8a1bb04637
This commit is contained in:
Michael Ennen 2016-10-26 21:56:02 -07:00 committed by James McCoy
parent 27b2fb944a
commit cf2701b269
3 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/nvim/eval.c
View File

@ -9455,6 +9455,7 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
char_u *s;
char_u *name;
bool use_string = false;
partial_T *arg_pt = NULL;
if (argvars[0].v_type == VAR_FUNC) {
// function(MyFunc, [arg], dict)
@ -9462,7 +9463,8 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
} else if (argvars[0].v_type == VAR_PARTIAL
&& argvars[0].vval.v_partial != NULL) {
// function(dict.MyFunc, [arg])
s = argvars[0].vval.v_partial->pt_name;
arg_pt = argvars[0].vval.v_partial;
s = arg_pt->pt_name;
} else {
// function('MyFunc', [arg], dict)
s = get_tv_string(&argvars[0]);
@ -9535,23 +9537,37 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
}
}
}
if (dict_idx > 0 || arg_idx > 0) {
if (dict_idx > 0 || arg_idx > 0 || arg_pt != NULL) {
partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
// result is a VAR_PARTIAL
if (pt != NULL) {
if (arg_idx > 0) {
if (arg_idx > 0 || (arg_pt != NULL && arg_pt->pt_argc > 0)) {
listitem_T *li;
int i = 0;
int arg_len = 0;
int lv_len = 0;
pt->pt_argv = (typval_T *)xmalloc(sizeof(typval_T) * list->lv_len);
if (arg_pt != NULL) {
arg_len = arg_pt->pt_argc;
}
if (list != NULL) {
lv_len = list->lv_len;
}
pt->pt_argc = arg_len + lv_len;
pt->pt_argv = (typval_T *)xmalloc(sizeof(typval_T) * pt->pt_argc);
if (pt->pt_argv == NULL) {
xfree(pt);
xfree(name);
return;
} else {
pt->pt_argc = list->lv_len;
for (li = list->lv_first; li != NULL; li = li->li_next) {
copy_tv(&li->li_tv, &pt->pt_argv[i++]);
for (i = 0; i < arg_len; i++) {
copy_tv(&arg_pt->pt_argv[i], &pt->pt_argv[i]);
}
if (lv_len > 0) {
for (li = list->lv_first; li != NULL; li = li->li_next) {
copy_tv(&li->li_tv, &pt->pt_argv[i++]);
}
}
}
}
@ -9561,9 +9577,11 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (dict_idx > 0) {
pt->pt_dict = argvars[dict_idx].vval.v_dict;
(pt->pt_dict->dv_refcount)++;
} else if (argvars[0].v_type == VAR_PARTIAL) {
pt->pt_dict = argvars[0].vval.v_partial->pt_dict;
(pt->pt_dict->dv_refcount)++;
} else if (arg_pt != NULL) {
pt->pt_dict = arg_pt->pt_dict;
if (pt->pt_dict != NULL) {
(pt->pt_dict->dv_refcount)++;
}
}
pt->pt_refcount = 1;
@ -9573,6 +9591,7 @@ static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
rettv->v_type = VAR_PARTIAL;
rettv->vval.v_partial = pt;
} else {
// result is a VAR_FUNC
rettv->v_type = VAR_FUNC;
rettv->vval.v_string = name;
func_ref(name);

8
src/nvim/testdir/test_partial.vim
View File

@ -20,9 +20,17 @@ func Test_partial_args()
call Cb("zzz")
call assert_equal("foo/bar/xxx", Cb("xxx"))
call assert_equal("foo/bar/yyy", call(Cb, ["yyy"]))
let Cb2 = function(Cb)
call assert_equal("foo/bar/zzz", Cb2("zzz"))
let Cb3 = function(Cb, ["www"])
call assert_equal("foo/bar/www", Cb3())
let Cb = function('MyFunc', [])
call assert_equal("a/b/c", Cb("a", "b", "c"))
let Cb2 = function(Cb, [])
call assert_equal("a/b/d", Cb2("a", "b", "d"))
let Cb3 = function(Cb, ["a", "b"])
call assert_equal("a/b/e", Cb3("e"))
let Sort = function('MySort', [1])
call assert_equal([1, 2, 3], sort([3, 1, 2], Sort))

2
src/nvim/version.c
View File

@ -856,7 +856,7 @@ static int included_patches[] = {
// 1589,
1588,
// 1587 NA
// 1586,
1586,
1585,
// 1584 NA
// 1583 NA