patch 8.2.4138: Vim9: no error for return with argument when invalid
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)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 75d0dd0..f495ddf 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -341,6 +341,20 @@
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 67e9ca5..6198d41 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
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 5beeab8..83ff699 100644
--- a/src/vim9cmds.c
+++ b/src/vim9cmds.c
@@ -2196,6 +2196,11 @@
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 @@
}
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;