Mercurial > vim
diff src/vim9compile.c @ 24645:668df21d8bc6 v8.2.2861
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Commit: https://github.com/vim/vim/commit/3b1373b193ce5fbf25e852277a4ecc98688c7bb8
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 17 00:01:42 2021 +0200
patch 8.2.2861: Vim9: "legacy return" is not recognized as a return statement
Problem: Vim9: "legacy return" is not recognized as a return statement.
Solution: Specifically check for a return command. (closes https://github.com/vim/vim/issues/8213)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 17 May 2021 00:15:03 +0200 |
parents | 4a4f64cdc798 |
children | 661d15592d3c |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -2174,6 +2174,25 @@ generate_EXEC(cctx_T *cctx, char_u *line } static int +generate_LEGACY_EVAL(cctx_T *cctx, char_u *line) +{ + isn_T *isn; + garray_T *stack = &cctx->ctx_type_stack; + + RETURN_OK_IF_SKIP(cctx); + if ((isn = generate_instr(cctx, ISN_LEGACY_EVAL)) == NULL) + return FAIL; + isn->isn_arg.string = vim_strsave(line); + + if (ga_grow(stack, 1) == FAIL) + return FAIL; + ((type_T **)stack->ga_data)[stack->ga_len] = &t_any; + ++stack->ga_len; + + return OK; +} + + static int generate_EXECCONCAT(cctx_T *cctx, int count) { isn_T *isn; @@ -5321,10 +5340,11 @@ compile_expr0(char_u **arg, cctx_T *cct } /* - * compile "return [expr]" + * Compile "return [expr]". + * When "legacy" is TRUE evaluate [expr] with legacy syntax */ static char_u * -compile_return(char_u *arg, int check_return_type, cctx_T *cctx) +compile_return(char_u *arg, int check_return_type, int legacy, cctx_T *cctx) { char_u *p = arg; garray_T *stack = &cctx->ctx_type_stack; @@ -5332,9 +5352,24 @@ compile_return(char_u *arg, int check_re if (*p != NUL && *p != '|' && *p != '\n') { - // compile return argument into instructions - if (compile_expr0(&p, cctx) == FAIL) - return NULL; + if (legacy) + { + int save_flags = cmdmod.cmod_flags; + + generate_LEGACY_EVAL(cctx, p); + if (need_type(&t_any, cctx->ctx_ufunc->uf_ret_type, -1, + 0, cctx, FALSE, FALSE) == FAIL) + return NULL; + cmdmod.cmod_flags |= CMOD_LEGACY; + (void)skip_expr(&p, NULL); + cmdmod.cmod_flags = save_flags; + } + else + { + // compile return argument into instructions + if (compile_expr0(&p, cctx) == FAIL) + return NULL; + } if (cctx->ctx_skip != SKIP_YES) { @@ -9193,7 +9228,15 @@ compile_def_function( // When using ":legacy cmd" always use compile_exec(). if (local_cmdmod.cmod_flags & CMOD_LEGACY) - ea.cmdidx = CMD_legacy; + { + char_u *start = ea.cmd; + + // ":legacy return expr" needs to be handled differently. + if (checkforcmd(&start, "return", 4)) + ea.cmdidx = CMD_return; + else + ea.cmdidx = CMD_legacy; + } if (p == ea.cmd && ea.cmdidx != CMD_SIZE) { @@ -9254,7 +9297,8 @@ compile_def_function( goto erret; case CMD_return: - line = compile_return(p, check_return_type, &cctx); + line = compile_return(p, check_return_type, + local_cmdmod.cmod_flags & CMOD_LEGACY, &cctx); cctx.ctx_had_return = TRUE; break; @@ -9605,6 +9649,7 @@ delete_instr(isn_T *isn) { case ISN_DEF: case ISN_EXEC: + case ISN_LEGACY_EVAL: case ISN_LOADAUTO: case ISN_LOADB: case ISN_LOADENV: