Skip to content

Commit 8922860

Browse files
committed
patch 8.2.0519: Vim9: return type not properly checked
Problem: Vim9: return type not properly checked. Solution: Check type properly, also at runtime.
1 parent 5ba8d35 commit 8922860

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

src/testdir/test_vim9_func.vim

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,10 @@ def FuncOneArgRetNumber(arg: number): number
380380
return arg
381381
enddef
382382

383+
def FuncOneArgRetAny(arg: any): any
384+
return arg
385+
enddef
386+
383387
def Test_func_type()
384388
let Ref1: func()
385389
funcResult = 0
@@ -417,5 +421,20 @@ def Test_func_type_fails()
417421
CheckDefFailure(['let Ref1: func()', 'Ref1 = FuncOneArgRetNumber'], 'E1013: type mismatch, expected func() but got func(number): number')
418422
enddef
419423

424+
def Test_func_return_type()
425+
let nr: number
426+
nr = FuncNoArgRetNumber()
427+
assert_equal(1234, nr)
428+
429+
nr = FuncOneArgRetAny(122)
430+
assert_equal(122, nr)
431+
432+
let str: string
433+
str = FuncOneArgRetAny('yes')
434+
assert_equal('yes', str)
435+
436+
CheckDefFailure(['let str: string', 'str = FuncNoArgRetNumber()'], 'E1013: type mismatch, expected string but got number')
437+
enddef
438+
420439

421440
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
519,
741743
/**/
742744
518,
743745
/**/

src/vim9compile.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,7 +2432,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
24322432
if (ret == FAIL && give_msg)
24332433
type_mismatch(expected, actual);
24342434
}
2435-
return OK;
2435+
return ret;
24362436
}
24372437

24382438
/*
@@ -2444,7 +2444,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
24442444
static int
24452445
need_type(type_T *actual, type_T *expected, int offset, cctx_T *cctx)
24462446
{
2447-
if (check_type(expected, actual, FALSE))
2447+
if (check_type(expected, actual, FALSE) == OK)
24482448
return OK;
24492449
if (actual->tt_type != VAR_ANY && actual->tt_type != VAR_UNKNOWN)
24502450
{
@@ -4069,7 +4069,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
40694069
lvar->lv_type = stacktype;
40704070
}
40714071
}
4072-
else if (check_type(lvar->lv_type, stacktype, TRUE) == FAIL)
4072+
else if (need_type(stacktype, lvar->lv_type, -1, cctx) == FAIL)
40734073
goto theend;
40744074
}
40754075
else if (*p != '=' && check_type(type, stacktype, TRUE) == FAIL)

0 commit comments

Comments
 (0)