summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-08 17:47:57 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-08 17:47:57 +0200
commit002262f4dee452964190b0d022aa7443f602b288 (patch)
tree3f871b4eabb910254d8b649d70322e4f06975e5f
parent7a4b8980ea5ecaea061caae7816ea62cc4940011 (diff)
downloadvim-git-8.2.1156.tar.gz
patch 8.2.1156: Vim9: No error for invalid command in compiled functionv8.2.1156
Problem: Vim9: No error for invalid command in compiled function. Solution: Handle CMD_SIZE.
-rw-r--r--src/testdir/test_vim9_expr.vim2
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index b3906c1b9..dd2a8ade5 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1420,7 +1420,7 @@ func Test_expr_fails()
call CheckDefFailure(["let x = '1'is2"], 'E488:')
call CheckDefFailure(["let x = '1'isnot2"], 'E488:')
- call CheckDefExecFailure(["CallMe ('yes')"], 'E492:')
+ call CheckDefFailure(["CallMe ('yes')"], 'E476:')
call CheckDefFailure(["CallMe2('yes','no')"], 'E1069:')
call CheckDefFailure(["CallMe2('yes' , 'no')"], 'E1068:')
diff --git a/src/version.c b/src/version.c
index c77d0bc7c..e362e2705 100644
--- 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 */
/**/
+ 1156,
+/**/
1155,
/**/
1154,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index c3c380852..07aacb37c 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7142,6 +7142,10 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
// TODO: other commands with an expression argument
+ case CMD_SIZE:
+ semsg(_("E476: Invalid command: %s"), ea.cmd);
+ goto erret;
+
default:
// Not recognized, execute with do_cmdline_cmd().
ea.arg = p;