Mercurial > vim
changeset 21957:4343657b49fa v8.2.1528
patch 8.2.1528: Vim9: :endif not found after "if false"
Commit: https://github.com/vim/vim/commit/3988f64f9d512fd809d4a600b020638bf2c7d7ec
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 27 22:43:03 2020 +0200
patch 8.2.1528: Vim9: :endif not found after "if false"
Problem: Vim9: :endif not found after "if false".
Solution: When skipping still check for a following command. (closes https://github.com/vim/vim/issues/6797)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 27 Aug 2020 22:45:03 +0200 |
| parents | 40078db932ef |
| children | d6f29ea3c947 |
| files | src/testdir/test_vim9_script.vim src/version.c src/vim9compile.c |
| diffstat | 3 files changed, 30 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2122,6 +2122,14 @@ def Test_if_const_expr() res = true endif assert_equal(false, res) + + # with constant "false" expression may be invalid so long as the syntax is OK + if false | eval 0 | endif + if false | eval burp + 234 | endif + if false | echo burp 234 'asd' | endif + if false + burp + endif enddef def Test_if_const_expr_fails()
--- 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 */ /**/ + 1528, +/**/ 1527, /**/ 1526,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4014,6 +4014,13 @@ compile_expr1(char_u **arg, cctx_T *cct int ppconst_used = ppconst->pp_used; char_u *next; + // Ignore all kinds of errors when not producing code. + if (cctx->ctx_skip == SKIP_YES) + { + skip_expr(arg); + return OK; + } + // Evaluate the first expression. if (compile_expr2(arg, cctx, ppconst) == FAIL) return FAIL; @@ -6724,18 +6731,9 @@ compile_def_function(ufunc_T *ufunc, int p = skipwhite(p); - if (cctx.ctx_skip == SKIP_YES - && ea.cmdidx != CMD_if + if (cctx.ctx_had_return && ea.cmdidx != CMD_elseif && ea.cmdidx != CMD_else - && ea.cmdidx != CMD_endif) - { - line = (char_u *)""; - continue; - } - - if (ea.cmdidx != CMD_elseif - && ea.cmdidx != CMD_else && ea.cmdidx != CMD_endif && ea.cmdidx != CMD_endfor && ea.cmdidx != CMD_endwhile @@ -6743,11 +6741,8 @@ compile_def_function(ufunc_T *ufunc, int && ea.cmdidx != CMD_finally && ea.cmdidx != CMD_endtry) { - if (cctx.ctx_had_return) - { - emsg(_(e_unreachable_code_after_return)); - goto erret; - } + emsg(_(e_unreachable_code_after_return)); + goto erret; } switch (ea.cmdidx) @@ -6845,7 +6840,7 @@ compile_def_function(ufunc_T *ufunc, int if (compile_expr0(&p, &cctx) == FAIL) goto erret; - // drop the return value + // drop the result generate_instr_drop(&cctx, ISN_DROP, 1); line = skipwhite(p); @@ -6859,7 +6854,7 @@ compile_def_function(ufunc_T *ufunc, int line = compile_mult_expr(p, ea.cmdidx, &cctx); break; - // TODO: other commands with an expression argument + // TODO: any other commands with an expression argument? case CMD_append: case CMD_change: @@ -6870,8 +6865,14 @@ compile_def_function(ufunc_T *ufunc, int goto erret; case CMD_SIZE: - semsg(_(e_invalid_command_str), ea.cmd); - goto erret; + if (cctx.ctx_skip != SKIP_YES) + { + semsg(_(e_invalid_command_str), ea.cmd); + goto erret; + } + // We don't check for a next command here. + line = (char_u *)""; + break; default: // Not recognized, execute with do_cmdline_cmd().