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/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;