diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-01-18 18:46:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-18 18:46:07 +0000 |
| commit | ef7aadbe36ad43a1b909f5f6c7e9b170ad62ef91 (patch) | |
| tree | a97150cc386a6fe634d987166c11d7bbf3c64576 | |
| parent | d02dce2bb572f0e6b4570442e9cdbed14ef41820 (diff) | |
patch 8.2.4138: Vim9: no error for return with argument when invalidv8.2.4138
Problem: Vim9: no error for return with argument when the function does not
return anything.
Solution: Give an error for the invalid argument. (issue #9497)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9cmds.c | 12 |
3 files changed, 21 insertions, 7 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 75d0dd0b65..f495ddfd78 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -341,6 +341,20 @@ def Test_return_something() ReturnString()->assert_equal('string') ReturnNumber()->assert_equal(123) assert_fails('ReturnGlobal()', 'E1012: Type mismatch; expected number but got string', '', 1, 'ReturnGlobal') + + var lines =<< trim END + vim9script + + def Msg() + echomsg 'in Msg()...' + enddef + + def Func() + return Msg() + enddef + defcompile + END + CheckScriptFailure(lines, 'E1096:') enddef def Test_check_argument_type() diff --git a/src/version.c b/src/version.c index 67e9ca5ff3..6198d41060 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 */ /**/ + 4138, +/**/ 4137, /**/ 4136, diff --git a/src/vim9cmds.c b/src/vim9cmds.c index 5beeab82e8..83ff6991bd 100644 --- a/src/vim9cmds.c +++ b/src/vim9cmds.c @@ -2196,6 +2196,11 @@ compile_return(char_u *arg, int check_return_type, int legacy, cctx_T *cctx) if (*p != NUL && *p != '|' && *p != '\n') { + if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID) + { + emsg(_(e_returning_value_in_function_without_return_type)); + return NULL; + } if (legacy) { int save_flags = cmdmod.cmod_flags; @@ -2231,13 +2236,6 @@ compile_return(char_u *arg, int check_return_type, int legacy, cctx_T *cctx) } else { - if (cctx->ctx_ufunc->uf_ret_type->tt_type == VAR_VOID - && stack_type->tt_type != VAR_VOID - && stack_type->tt_type != VAR_UNKNOWN) - { - emsg(_(e_returning_value_in_function_without_return_type)); - return NULL; - } if (need_type(stack_type, cctx->ctx_ufunc->uf_ret_type, -1, 0, cctx, FALSE, FALSE) == FAIL) return NULL; |