commit e28d9b3bd4de2c7288add83ec35dc001ba280617
author Bram Moolenaar <Bram@vim.org> Sat Jul 03 18:56:53 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jul 03 18:56:53 2021 +0200
tree 9703589a42e63637f98b4799da3f5d5157607d4c
parent 00aaa512d5e775e0db21e251f43d7afb8fca910f

patch 8.2.3091: Vim9: default argument expr. cannot use previous argument

Problem:    Vim9: default argument expression cannot use previous argument
Solution:   Correct argument index. (closes #8496)

src/vim9compile.c

diff --git a/src/vim9compile.c b/src/vim9compile.c
index d074215..88086ce 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -274,7 +274,7 @@
 
     if (len == 0)
 	return FAIL;
-    for (idx = 0; idx < cctx->ctx_ufunc->uf_args.ga_len; ++idx)
+    for (idx = 0; idx < cctx->ctx_ufunc->uf_args_visible; ++idx)
     {
 	char_u *arg = FUNCARG(cctx->ctx_ufunc, idx);
 
@@ -9172,7 +9172,6 @@
     {
 	int	count = ufunc->uf_def_args.ga_len;
 	int	first_def_arg = ufunc->uf_args.ga_len - count;
-	int	uf_args_len = ufunc->uf_args.ga_len;
 	int	i;
 	char_u	*arg;
 	int	off = STACK_FRAME_SIZE + (ufunc->uf_va_name != NULL ? 1 : 0);
@@ -9195,12 +9194,11 @@
 		goto erret;
 
 	    // Make sure later arguments are not found.
-	    ufunc->uf_args.ga_len = i;
+	    ufunc->uf_args_visible = arg_idx;
 
 	    arg = ((char_u **)(ufunc->uf_def_args.ga_data))[i];
 	    r = compile_expr0(&arg, &cctx);
 
-	    ufunc->uf_args.ga_len = uf_args_len;
 	    if (r == FAIL)
 		goto erret;
 
@@ -9230,6 +9228,7 @@
 	if (did_set_arg_type)
 	    set_function_type(ufunc);
     }
+    ufunc->uf_args_visible = ufunc->uf_args.ga_len;
 
     /*
      * Loop over all the lines of the function and generate instructions.