summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-04-09 22:12:44 +0200
committerBram Moolenaar <Bram@vim.org>2021-04-09 22:12:44 +0200
commit1088b69451c739c698cf4c2003c2b994458ad18b (patch)
treefb73f56746f67cdb10a6871a11b4c0dd2f9a633a
parent2a38908b05c1d3973a8edbeb5b3e05a11332faf0 (diff)
downloadvim-git-8.2.2741.tar.gz
patch 8.2.2741: Vim9: Partial call does not check right argumentsv8.2.2741
Problem: Vim9: Partial call does not check right arguments. Solution: Adjust the offset for whether the partial is before or after the arguments. (closes #8091)
-rw-r--r--src/testdir/test_vim9_func.vim2
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index d48cab452..85830a36c 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -796,6 +796,8 @@ def Test_call_lambda_args()
assert_equal('anything', Callback())
assert_equal('anything', Callback(1))
assert_equal('anything', Callback('a', 2))
+
+ assert_equal('xyz', ((a: string): string => a)('xyz'))
END
CheckDefAndScriptSuccess(lines)
diff --git a/src/version.c b/src/version.c
index 74a0ae6e7..64c5af40b 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 */
/**/
+ 2741,
+/**/
2740,
/**/
2739,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 2cfc12798..c2735dcbd 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1969,7 +1969,7 @@ generate_PCALL(
for (i = 0; i < argcount; ++i)
{
- int offset = -argcount + i - 1;
+ int offset = -argcount + i - (at_top ? 0 : 1);
type_T *actual = ((type_T **)stack->ga_data)[
stack->ga_len + offset];
type_T *expected;