Mercurial > vim
changeset 8575:b5209a4e5baf v7.4.1577
commit https://github.com/vim/vim/commit/ab1fa3955f25dfdb7e329c3bd76e175c93c8cb5e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 15 19:33:34 2016 +0100
patch 7.4.1577
Problem: Cannot pass "dict.Myfunc" around as a partial.
Solution: Create a partial when expected.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 15 Mar 2016 19:45:06 +0100 |
| parents | a192274c1ac6 |
| children | 3fd90fff8ab5 |
| files | src/eval.c src/testdir/test_partial.vim src/version.c |
| diffstat | 3 files changed, 73 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -110,6 +110,7 @@ static char *e_illvar = N_("E461: Illega #ifdef FEAT_FLOAT static char *e_float_as_string = N_("E806: using Float as a String"); #endif +static char *e_dict_both = N_("E924: can't have both a \"self\" dict and a partial: %s"); #define NAMESPACE_CHAR (char_u *)"abglstvw" @@ -8912,8 +8913,7 @@ call_func( name); break; case ERROR_BOTH: - emsg_funcname(N_("E924: can't have both a \"self\" dict and a partial: %s"), - name); + emsg_funcname(e_dict_both, name); break; } } @@ -11782,12 +11782,29 @@ f_function(typval_T *argvars, typval_T * { char_u *s; char_u *name; - - s = get_tv_string(&argvars[0]); - if (s == NULL || *s == NUL || VIM_ISDIGIT(*s)) + int use_string = FALSE; + + if (argvars[0].v_type == VAR_FUNC) + { + /* function(MyFunc, [arg], dict) */ + s = argvars[0].vval.v_string; + } + 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; + else + { + /* function('MyFunc', [arg], dict) */ + s = get_tv_string(&argvars[0]); + use_string = TRUE; + } + + if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s))) EMSG2(_(e_invarg2), s); /* Don't check an autoload name for existence here. */ - else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s)) + else if (use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL + && !function_exists(s)) EMSG2(_("E700: Unknown function: %s"), s); else { @@ -11837,6 +11854,12 @@ f_function(typval_T *argvars, typval_T * vim_free(name); return; } + if (argvars[0].v_type == VAR_PARTIAL) + { + EMSG2(_(e_dict_both), name); + vim_free(name); + return; + } if (argvars[dict_idx].vval.v_dict == NULL) dict_idx = 0; } @@ -11880,7 +11903,12 @@ f_function(typval_T *argvars, typval_T * } } - if (dict_idx > 0) + if (argvars[0].v_type == VAR_PARTIAL) + { + pt->pt_dict = argvars[0].vval.v_partial->pt_dict; + ++pt->pt_dict->dv_refcount; + } + else if (dict_idx > 0) { pt->pt_dict = argvars[dict_idx].vval.v_dict; ++pt->pt_dict->dv_refcount; @@ -21533,7 +21561,7 @@ handle_subscript( rettv->v_type = VAR_UNKNOWN; /* Invoke the function. Recursive! */ - if (rettv->v_type == VAR_PARTIAL) + if (functv.v_type == VAR_PARTIAL) { pt = functv.vval.v_partial; s = pt->pt_name; @@ -21582,6 +21610,23 @@ handle_subscript( } } } + + if (rettv->v_type == VAR_FUNC && selfdict != NULL) + { + partial_T *pt = (partial_T *)alloc_clear(sizeof(partial_T)); + + /* Turn "dict.Func" into a partial for "Func" with "dict". */ + if (pt != NULL) + { + pt->pt_dict = selfdict; + selfdict = NULL; + pt->pt_name = rettv->vval.v_string; + func_ref(pt->pt_name); + rettv->v_type = VAR_PARTIAL; + rettv->vval.v_partial = pt; + } + } + dict_unref(selfdict); return ret; }
--- a/src/testdir/test_partial.vim +++ b/src/testdir/test_partial.vim @@ -50,3 +50,21 @@ func Test_partial_dict() call assert_equal("hello/xxx/yyy", Cb("xxx", "yyy")) call assert_fails('Cb("fff")', 'E492:') endfunc + +func Test_partial_implicit() + let dict = {'name': 'foo'} + func dict.MyFunc(arg) dict + return self.name . '/' . a:arg + endfunc + + call assert_equal('foo/bar', dict.MyFunc('bar')) + + call assert_fails('let func = dict.MyFunc', 'E704:') + let Func = dict.MyFunc + call assert_equal('foo/aaa', Func('aaa')) + + let Func = function(dict.MyFunc, ['bbb']) + call assert_equal('foo/bbb', Func()) + + call assert_fails('call function(dict.MyFunc, ["bbb"], dict)', 'E924:') +endfunc