diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-24 18:37:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-24 18:37:12 +0200 |
| commit | 2bbf8eff6fab16d86e7bcfc0da1962d31bec7891 (patch) | |
| tree | 7caeb82bd296e6031357318339d5f5c271e0763e /src | |
| parent | 574860b5ee9da281c875dad07a607454e135eaee (diff) | |
| download | vim-git-2bbf8eff6fab16d86e7bcfc0da1962d31bec7891.tar.gz | |
patch 7.4.1839v7.4.1839
Problem: Cannot get the items stored in a partial.
Solution: Support using get() on a partial.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 39 | ||||
| -rw-r--r-- | src/testdir/test_partial.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 50 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index a653b89f7..99b948c7d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -12423,6 +12423,45 @@ f_get(typval_T *argvars, typval_T *rettv) tv = &di->di_tv; } } + else if (argvars[0].v_type == VAR_PARTIAL) + { + partial_T *pt = argvars[0].vval.v_partial; + + if (pt != NULL) + { + char_u *what = get_tv_string(&argvars[1]); + + if (STRCMP(what, "func") == 0) + { + rettv->v_type = VAR_STRING; + if (pt->pt_name == NULL) + rettv->vval.v_string = NULL; + else + rettv->vval.v_string = vim_strsave(pt->pt_name); + } + else if (STRCMP(what, "dict") == 0) + { + rettv->v_type = VAR_DICT; + rettv->vval.v_dict = pt->pt_dict; + if (pt->pt_dict != NULL) + ++pt->pt_dict->dv_refcount; + } + else if (STRCMP(what, "args") == 0) + { + rettv->v_type = VAR_LIST; + if (rettv_list_alloc(rettv) == OK) + { + int i; + + for (i = 0; i < pt->pt_argc; ++i) + list_append_tv(rettv->vval.v_list, &pt->pt_argv[i]); + } + } + else + EMSG2(_(e_invarg2), what); + return; + } + } else EMSG2(_(e_listdictarg), "get()"); diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim index 8b11200d2..30e1df99e 100644 --- a/src/testdir/test_partial.vim +++ b/src/testdir/test_partial.vim @@ -279,3 +279,12 @@ func Test_auto_partial_rebind() call assert_equal('dict1', dict2.f2()) call assert_equal('dict1', dict2['f2']()) endfunc + +func Test_get_partial_items() + let dict = {'name': 'hello'} + let Cb = function('MyDictFunc', ["foo", "bar"], dict) + call assert_equal('MyDictFunc', get(Cb, 'func')) + call assert_equal(["foo", "bar"], get(Cb, 'args')) + call assert_equal(dict, get(Cb, 'dict')) + call assert_fails('call get(Cb, "xxx")', 'E475:') +endfunc diff --git a/src/version.c b/src/version.c index 46aff5391..b53a74426 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1839, +/**/ 1838, /**/ 1837, |