diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-08-08 16:47:30 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-08-08 16:47:30 +0200 |
commit | 5a849da57c5fb54ffcffd436a9e00ef40fdf094c (patch) | |
tree | a3e29fde05cb840316c5e043635e64407c46087e | |
parent | 98b4f145eb89405021e23a4a37db51d60a75a1d0 (diff) | |
download | vim-git-5a849da57c5fb54ffcffd436a9e00ef40fdf094c.tar.gz |
patch 8.2.1396: Vim9: no error for unexpectedly returning a valuev8.2.1396
Problem: Vim9: no error for unexpectedly returning a value.
Solution: Only set the return type for lambda's. Make using function type
in a function reference work.
-rw-r--r-- | src/testdir/test_vim9_func.vim | 44 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 26 |
3 files changed, 57 insertions, 15 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index d39584154..4a020c9af 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -503,16 +503,48 @@ def Test_error_in_nested_function() enddef def Test_return_type_wrong() - CheckScriptFailure(['def Func(): number', 'return "a"', 'enddef', 'defcompile'], 'expected number but got string') - CheckScriptFailure(['def Func(): string', 'return 1', 'enddef', 'defcompile'], 'expected string but got number') - CheckScriptFailure(['def Func(): void', 'return "a"', 'enddef', 'defcompile'], 'E1096: Returning a value in a function without a return type') - CheckScriptFailure(['def Func()', 'return "a"', 'enddef', 'defcompile'], 'E1096: Returning a value in a function without a return type') - - CheckScriptFailure(['def Func(): number', 'return', 'enddef', 'defcompile'], 'E1003:') + CheckScriptFailure([ + 'def Func(): number', + 'return "a"', + 'enddef', + 'defcompile'], 'expected number but got string') + CheckScriptFailure([ + 'def Func(): string', + 'return 1', + 'enddef', + 'defcompile'], 'expected string but got number') + CheckScriptFailure([ + 'def Func(): void', + 'return "a"', + 'enddef', + 'defcompile'], + 'E1096: Returning a value in a function without a return type') + CheckScriptFailure([ + 'def Func()', + 'return "a"', + 'enddef', + 'defcompile'], + 'E1096: Returning a value in a function without a return type') + + CheckScriptFailure([ + 'def Func(): number', + 'return', + 'enddef', + 'defcompile'], 'E1003:') CheckScriptFailure(['def Func(): list', 'return []', 'enddef'], 'E1008:') CheckScriptFailure(['def Func(): dict', 'return {}', 'enddef'], 'E1008:') CheckScriptFailure(['def Func()', 'return 1'], 'E1057:') + + CheckScriptFailure([ + 'vim9script', + 'def FuncB()', + ' return 123', + 'enddef', + 'def FuncA()', + ' FuncB()', + 'enddef', + 'defcompile'], 'E1096:') enddef def Test_arg_type_wrong() diff --git a/src/version.c b/src/version.c index 870df1766..8649ca896 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1396, +/**/ 1395, /**/ 1394, diff --git a/src/vim9compile.c b/src/vim9compile.c index 0664124fe..5f76bc2c0 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -662,8 +662,10 @@ check_type(type_T *expected, type_T *actual, int give_msg) int i; for (i = 0; i < expected->tt_argcount; ++i) - if (check_type(expected->tt_args[i], actual->tt_args[i], - FALSE) == FAIL) + // Allow for using "any" argument type, lambda's have them. + if (actual->tt_args[i] != &t_any && check_type( + expected->tt_args[i], actual->tt_args[i], FALSE) + == FAIL) { ret = FAIL; break; @@ -1537,7 +1539,7 @@ generate_NEWDICT(cctx_T *cctx, int count) * Generate an ISN_FUNCREF instruction. */ static int -generate_FUNCREF(cctx_T *cctx, int dfunc_idx) +generate_FUNCREF(cctx_T *cctx, ufunc_T *ufunc) { isn_T *isn; garray_T *stack = &cctx->ctx_type_stack; @@ -1545,13 +1547,13 @@ generate_FUNCREF(cctx_T *cctx, int dfunc_idx) RETURN_OK_IF_SKIP(cctx); if ((isn = generate_instr(cctx, ISN_FUNCREF)) == NULL) return FAIL; - isn->isn_arg.funcref.fr_func = dfunc_idx; + isn->isn_arg.funcref.fr_func = ufunc->uf_dfunc_idx; isn->isn_arg.funcref.fr_var_idx = cctx->ctx_closure_count++; if (ga_grow(stack, 1) == FAIL) return FAIL; - ((type_T **)stack->ga_data)[stack->ga_len] = &t_func_any; - // TODO: argument and return types + ((type_T **)stack->ga_data)[stack->ga_len] = + ufunc->uf_func_type == NULL ? &t_func_any : ufunc->uf_func_type; ++stack->ga_len; return OK; @@ -1713,7 +1715,8 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount) } } if (ufunc->uf_def_status == UF_TO_BE_COMPILED) - if (compile_def_function(ufunc, TRUE, NULL) == FAIL) + if (compile_def_function(ufunc, ufunc->uf_ret_type == NULL, NULL) + == FAIL) return FAIL; } @@ -3338,7 +3341,12 @@ compile_lambda(char_u **arg, cctx_T *cctx) clear_evalarg(&evalarg, NULL); if (ufunc->uf_def_status == UF_COMPILED) - return generate_FUNCREF(cctx, ufunc->uf_dfunc_idx); + { + // The return type will now be known. + set_function_type(ufunc); + + return generate_FUNCREF(cctx, ufunc); + } func_ptr_unref(ufunc); return FAIL; @@ -4982,7 +4990,7 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx) TRUE, ufunc->uf_func_type); if (lvar == NULL) return NULL; - if (generate_FUNCREF(cctx, ufunc->uf_dfunc_idx) == FAIL) + if (generate_FUNCREF(cctx, ufunc) == FAIL) return NULL; r = generate_STORE(cctx, ISN_STORE, lvar->lv_idx, NULL); } |