aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.0625: Vim9: confusing error when calling unknown function

Browse Source 
Problem:    Vim9: confusing error when calling unknown function.
Solution:   Give error while compiling.
This commit is contained in:
Bram Moolenaar
2020-04-23 18:13:23 +02:00
parent a72cfb80cd
commit 1df8b3fb04
4 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/testdir/test_vim9_func.vim
View File

@@ -193,10 +193,23 @@ def Test_using_var_as_arg()
enddef enddef
def Test_call_func_defined_later() def Test_call_func_defined_later()
call assert_equal('one', DefinedLater('one')) call assert_equal('one', g:DefinedLater('one'))
call assert_fails('call NotDefined("one")', 'E117:') call assert_fails('call NotDefined("one")', 'E117:')
enddef enddef
func DefinedLater(arg)
return a:arg
endfunc
def Test_call_funcref()
assert_equal(3, g:SomeFunc('abc'))
assert_fails('NotAFunc()', 'E117:')
assert_fails('g:NotAFunc()', 'E117:')
enddef
let SomeFunc = function('len')
let NotAFunc = 'text'
def CombineFuncrefTypes() def CombineFuncrefTypes()
" same arguments, different return type " same arguments, different return type
let Ref1: func(bool): string let Ref1: func(bool): string
@@ -217,12 +230,8 @@ def CombineFuncrefTypes()
Refb3 = g:cond ? Refb1 : Refb2 Refb3 = g:cond ? Refb1 : Refb2
enddef enddef
func DefinedLater(arg)
return a:arg
endfunc
def FuncWithForwardCall() def FuncWithForwardCall()
return DefinedEvenLater("yes") return g:DefinedEvenLater("yes")
enddef enddef
def DefinedEvenLater(arg: string): string def DefinedEvenLater(arg: string): string
@@ -372,9 +381,9 @@ def Test_redef_failure()
so Xdef so Xdef
call delete('Xdef') call delete('Xdef')
call assert_equal(0, Func0()) call assert_equal(0, g:Func0())
call assert_equal('Func1', Func1()) call assert_equal('Func1', g:Func1())
call assert_equal('Func2', Func2()) call assert_equal('Func2', g:Func2())
delfunc! Func0 delfunc! Func0
delfunc! Func1 delfunc! Func1

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
625,
/**/ /**/
624, 624,
/**/ /**/

8
src/vim9compile.c
View File

@@ -2463,8 +2463,12 @@ compile_call(char_u **arg, size_t varlen, cctx_T *cctx, int argcount_init)
goto theend; goto theend;
} }
// The function may be defined only later. Need to figure out at runtime. // A global function may be defined only later. Need to figure out at
res = generate_UCALL(cctx, name, argcount); // runtime.
if (STRNCMP(namebuf, "g:", 2) == 0)
res = generate_UCALL(cctx, name, argcount);
else
semsg(_(e_unknownfunc), namebuf);
theend: theend:
vim_free(tofree); vim_free(tofree);

21
src/vim9execute.c
View File

@@ -460,13 +460,20 @@ call_eval_func(char_u *name, int argcount, ectx_T *ectx, isn_T *iptr)
if (call_by_name(name, argcount, ectx, iptr) == FAIL if (call_by_name(name, argcount, ectx, iptr) == FAIL
&& called_emsg == called_emsg_before) && called_emsg == called_emsg_before)
{ {
// "name" may be a variable that is a funcref or partial dictitem_T *v;
// if find variable
// call_partial() v = find_var(name, NULL, FALSE);
// else if (v == NULL)
// semsg(_(e_unknownfunc), name); {
emsg("call_eval_func(partial) not implemented yet"); semsg(_(e_unknownfunc), name);
return FAIL; return FAIL;
}
if (v->di_tv.v_type != VAR_PARTIAL && v->di_tv.v_type != VAR_FUNC)
{
semsg(_(e_unknownfunc), name);
return FAIL;
}
return call_partial(&v->di_tv, argcount, ectx);
} }
return OK; return OK;
} }