summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-07 15:59:49 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-07 15:59:49 +0100
commit4f53b79bf5f8b0de7c6933fd157894ba7a53f35e (patch)
tree3b13a0798bb2d6d5a006dd69b8b1cd2f517a1788
parentc3fc75db023f2acd0b82b7eebffd7ed89e8001ed (diff)
downloadvim-git-4f53b79bf5f8b0de7c6933fd157894ba7a53f35e.tar.gz
patch 8.2.2481: Vim9: confusing error when variable arguments have defaultv8.2.2481
Problem: Vim9: confusing error when variable arguments have a default value. Solution: Give a specific error message. (closes #7793)
-rw-r--r--src/testdir/test_vim9_func.vim10
-rw-r--r--src/userfunc.c5
-rw-r--r--src/version.c2
3 files changed, 17 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 73ff693fa..cdaba5af7 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -781,6 +781,16 @@ def Test_call_def_varargs()
Func(1, 'a')
END
CheckScriptFailure(lines, 'E1013: Argument 1: type mismatch')
+
+ lines =<< trim END
+ vim9script
+ def Func( # some comment
+ ...l = []
+ )
+ echo l
+ enddef
+ END
+ CheckScriptFailure(lines, 'E1160:')
enddef
let s:value = ''
diff --git a/src/userfunc.c b/src/userfunc.c
index e220781b1..82df0bb96 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -241,6 +241,11 @@ get_function_args(
skip);
if (p == arg)
break;
+ if (*skipwhite(p) == '=')
+ {
+ emsg(_(e_cannot_use_default_for_variable_arguments));
+ break;
+ }
}
}
else
diff --git a/src/version.c b/src/version.c
index 871e04892..c6f44a401 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2481,
+/**/
2480,
/**/
2479,