thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0519: Vim9: return type not properly checked

Browse Source 
Problem:    Vim9: return type not properly checked.
Solution:   Check type properly, also at runtime.
This commit is contained in:
Bram Moolenaar
2020-04-05 22:14:54 +02:00
parent 5ba8d3578c
commit 8922860afb
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/testdir/test_vim9_func.vim
View File

@@ -380,6 +380,10 @@ def FuncOneArgRetNumber(arg: number): number
return arg return arg
enddef enddef
def FuncOneArgRetAny(arg: any): any
return arg
enddef
def Test_func_type() def Test_func_type()
let Ref1: func() let Ref1: func()
funcResult = 0 funcResult = 0
@@ -417,5 +421,20 @@ def Test_func_type_fails()
CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncOneArgRetNumber'], 'E1013: type mismatch, expected func() but got func(number): number') CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncOneArgRetNumber'], 'E1013: type mismatch, expected func() but got func(number): number')
enddef enddef
def Test_func_return_type()
let nr: number
nr = FuncNoArgRetNumber()
assert_equal(1234, nr)
nr = FuncOneArgRetAny(122)
assert_equal(122, nr)
let str: string
str = FuncOneArgRetAny('yes')
assert_equal('yes', str)
CheckDefFailure(['let str: string', 'str = FuncNoArgRetNumber()'], 'E1013: type mismatch, expected string but got number')
enddef
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

2
src/version.c
View File

@@ -738,6 +738,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 */
/**/
519,
/**/ /**/
518, 518,
/**/ /**/

6
src/vim9compile.c
View File

@@ -2432,7 +2432,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
if (ret == FAIL && give_msg) if (ret == FAIL && give_msg)
type_mismatch(expected, actual); type_mismatch(expected, actual);
} }
return OK; return ret;
} }
/* /*
@@ -2444,7 +2444,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
static int static int
need_type(type_T *actual, type_T *expected, int offset, cctx_T *cctx) need_type(type_T *actual, type_T *expected, int offset, cctx_T *cctx)
{ {
if (check_type(expected, actual, FALSE)) if (check_type(expected, actual, FALSE) == OK)
return OK; return OK;
if (actual->tt_type != VAR_ANY && actual->tt_type != VAR_UNKNOWN) if (actual->tt_type != VAR_ANY && actual->tt_type != VAR_UNKNOWN)
{ {
@@ -4069,7 +4069,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
lvar->lv_type = stacktype; lvar->lv_type = stacktype;
} }
} }
else if (check_type(lvar->lv_type, stacktype, TRUE) == FAIL) else if (need_type(stacktype, lvar->lv_type, -1, cctx) == FAIL)
goto theend; goto theend;
} }
else if (*p != '=' && check_type(type, stacktype, TRUE) == FAIL) else if (*p != '=' && check_type(type, stacktype, TRUE) == FAIL)