diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-01-07 19:23:08 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-01-07 19:23:08 +0100 |
commit | 328eac2b5d1569c57e1130ecb9f7cca733b84d78 (patch) | |
tree | 5905788ba7946b3fc27ec5275ee2a33196f5c91f | |
parent | ebbf11c1198b7aec8a1a55f7231ecb4f1a432fa0 (diff) | |
download | vim-git-328eac2b5d1569c57e1130ecb9f7cca733b84d78.tar.gz |
patch 8.2.2308: Vim9: no error when assigning lambda to funcrefv8.2.2308
Problem: Vim9: no error when assigning lambda to funcref without return
value.
Solution: Default return value to "any". (closes #7629)
-rw-r--r-- | src/testdir/test_vim9_assign.vim | 7 | ||||
-rw-r--r-- | src/testdir/test_vim9_func.vim | 2 | ||||
-rw-r--r-- | src/userfunc.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 7 |
5 files changed, 16 insertions, 4 deletions
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index 2a21ca065..2d137a328 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1091,6 +1091,13 @@ def Test_assign_lambda() assert_equal(123, FuncRef_Any()) END CheckScriptSuccess(lines) + + lines =<< trim END + var Ref: func(number) + Ref = (j) => !j + END + CheckDefFailure(lines, 'E1012: Type mismatch; expected func(number) but got func(any): bool') + CheckScriptFailure(['vim9script'] + lines, 'E1012: Type mismatch; expected func(number) but got func(any): any') enddef def Test_heredoc() diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index c26f2af5b..9f19ebda9 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1508,7 +1508,7 @@ def Test_unknown_function() 'delfunc g:NotExist'], 'E700:') enddef -def RefFunc(Ref: func(string): string): string +def RefFunc(Ref: func(any): any): string return Ref('more') enddef diff --git a/src/userfunc.c b/src/userfunc.c index 4c59bb516..814d400fb 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -668,7 +668,7 @@ get_lambda_tv( goto errret; } else - fp->uf_ret_type = &t_unknown; + fp->uf_ret_type = &t_any; } fp->uf_lines = newlines; diff --git a/src/version.c b/src/version.c index 3f8ed2a41..f39a0d361 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2308, +/**/ 2307, /**/ 2306, diff --git a/src/vim9compile.c b/src/vim9compile.c index c3aab20d3..f66b27ff5 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -857,7 +857,9 @@ use_typecheck(type_T *actual, type_T *expected) || (actual->tt_type == VAR_FUNC && (expected->tt_type == VAR_FUNC || expected->tt_type == VAR_PARTIAL) - && (actual->tt_member == &t_any || actual->tt_argcount < 0))) + && (actual->tt_member == &t_any || actual->tt_argcount < 0) + && ((actual->tt_member == &t_void) + == (expected->tt_member == &t_void)))) return TRUE; if ((actual->tt_type == VAR_LIST || actual->tt_type == VAR_DICT) && actual->tt_type == expected->tt_type) @@ -4812,7 +4814,8 @@ compile_return(char_u *arg, int check_return_type, cctx_T *cctx) { stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1]; if (check_return_type && (cctx->ctx_ufunc->uf_ret_type == NULL - || cctx->ctx_ufunc->uf_ret_type == &t_unknown)) + || cctx->ctx_ufunc->uf_ret_type == &t_unknown + || cctx->ctx_ufunc->uf_ret_type == &t_any)) { cctx->ctx_ufunc->uf_ret_type = stack_type; } |