Patch 9.0.0504

[Bram Moolenaar]

Patch 9.0.0504 (after 9.0.0502)
Problem: still a Build failure.
Solution: Add another missing changes. Avoid compiler warning.
Files: src/vim9expr.c, src/vim9execute.c


*** ../vim-9.0.0503/src/vim9expr.c 2022-09-17 21:07:52.103993150 +0100
--- src/vim9expr.c 2022-09-18 21:15:59.439342665 +0100
***************
*** 496,501 ****
--- 496,502 ----
int idx;
int gen_load = FALSE;
int gen_load_outer = 0;
+ int outer_loop_depth = -1;
int outer_loop_idx = -1;

name = vim_strnsave(*arg, end - *arg);
***************
*** 521,526 ****
--- 522,528 ----
{
type = lvar.lv_type;
idx = lvar.lv_idx;
+ outer_loop_depth = lvar.lv_loop_depth;
outer_loop_idx = lvar.lv_loop_idx;
if (lvar.lv_from_outer != 0)
gen_load_outer = lvar.lv_from_outer;
***************
*** 546,553 ****
res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
if (gen_load_outer > 0)
{
! res = generate_LOADOUTER(cctx, idx,
! gen_load_outer, outer_loop_idx, type);
cctx->ctx_outer_used = TRUE;
}
}
--- 548,555 ----
res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
if (gen_load_outer > 0)
{
! res = generate_LOADOUTER(cctx, idx, gen_load_outer,
! outer_loop_depth, outer_loop_idx, type);
cctx->ctx_outer_used = TRUE;
}
}
*** ../vim-9.0.0503/src/vim9execute.c 2022-09-19 15:54:29.539117880 +0100
--- src/vim9execute.c 2022-09-19 16:07:25.253179306 +0100
***************
*** 5955,5967 ****
if (ga_grow(&ga, 50) == FAIL)
break;
if (lvi->lvi_loop[depth].var_idx == 0)
! STRCPY(ga.ga_data + ga.ga_len, " -");
else
! vim_snprintf(ga.ga_data + ga.ga_len, 50, " $%d-$%d",
lvi->lvi_loop[depth].var_idx,
lvi->lvi_loop[depth].var_idx
+ lvi->lvi_loop[depth].var_count - 1);
! ga.ga_len = STRLEN(ga.ga_data);
}
return ga.ga_data;
}
--- 5955,5967 ----
if (ga_grow(&ga, 50) == FAIL)
break;
if (lvi->lvi_loop[depth].var_idx == 0)
! STRCPY((char *)ga.ga_data + ga.ga_len, " -");
else
! vim_snprintf((char *)ga.ga_data + ga.ga_len, 50, " $%d-$%d",
lvi->lvi_loop[depth].var_idx,
lvi->lvi_loop[depth].var_idx
+ lvi->lvi_loop[depth].var_count - 1);
! ga.ga_len = (int)STRLEN(ga.ga_data);
}
return ga.ga_data;
}
*** ../vim-9.0.0503/src/version.c 2022-09-19 16:02:40.122484610 +0100
--- src/version.c 2022-09-19 16:05:10.369933447 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 504,
/**/

--
# echo reboot >universe
# chmod +x universe
# ./universe

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///