patch 8.2.0276: Vim9: not allowing space before ")" in function call
Problem: Vim9: not allowing space before ")" in function call is too
restrictive. (Ben Jackson)
Solution: Skip space before the ")". Adjust other space checks.
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index c0767f5..1f3e417 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -9,6 +9,14 @@
call delete('Xdef')
endfunc
+" Check that "line" inside ":def" results in an "error" message when executed.
+func CheckDefExecFailure(line, error)
+ call writefile(['def! Func()', a:line, 'enddef'], 'Xdef')
+ so Xdef
+ call assert_fails('call Func()', a:error, a:line)
+ call delete('Xdef')
+endfunc
+
func CheckDefFailureList(lines, error)
call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef')
call assert_fails('so Xdef', a:error, string(a:lines))
@@ -725,9 +733,17 @@
return a:arg
endfunc
+func CallMe2(one, two)
+ return a:one .. a:two
+endfunc
+
def Test_expr7_trailing()
" user function call
assert_equal(123, CallMe(123))
+ assert_equal(123, CallMe( 123))
+ assert_equal(123, CallMe(123 ))
+ assert_equal('yesno', CallMe2('yes', 'no'))
+ assert_equal('yesno', CallMe2( 'yes', 'no' ))
assert_equal('nothing', CallMe('nothing'))
" partial call
@@ -761,4 +777,8 @@
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("CallMe2('yes','no')", 'E1069:')
+ call CheckDefFailure("CallMe2('yes' , 'no')", 'E1068:')
endfunc
diff --git a/src/version.c b/src/version.c
index 41d021f..5095de4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 276,
+/**/
275,
/**/
274,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index adfcbcc..8614943 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1658,9 +1658,21 @@
if (compile_expr1(&p, cctx) == FAIL)
return FAIL;
++*argcount;
+
+ if (*p != ',' && *skipwhite(p) == ',')
+ {
+ emsg(_("E1068: No white space allowed before ,"));
+ p = skipwhite(p);
+ }
if (*p == ',')
- p = skipwhite(p + 1);
+ {
+ ++p;
+ if (!VIM_ISWHITE(*p))
+ emsg(_("E1069: white space required after ,"));
+ }
+ p = skipwhite(p);
}
+ p = skipwhite(p);
if (*p != ')')
{
emsg(_(e_missing_close));