thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0504: still a build failure

Browse Source 
Problem:    still a Build failure.
Solution:   Add another missing changes.  Avoid compiler warning.
This commit is contained in:
Bram Moolenaar
2022-09-19 16:08:04 +01:00
parent 65449bd1ee
commit c9e4a6f191
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -699,6 +699,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
504,
/**/ /**/
503, 503,
/**/ /**/

6
src/vim9execute.c
View File

@@ -5955,13 +5955,13 @@ printable_loopvarinfo(loopvarinfo_T *lvi)
if (ga_grow(&ga, 50) == FAIL) if (ga_grow(&ga, 50) == FAIL)
break; break;
if (lvi->lvi_loop[depth].var_idx == 0) if (lvi->lvi_loop[depth].var_idx == 0)
STRCPY(ga.ga_data + ga.ga_len, " -"); STRCPY((char *)ga.ga_data + ga.ga_len, " -");
else else
vim_snprintf(ga.ga_data + ga.ga_len, 50, " $%d-$%d", 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_idx lvi->lvi_loop[depth].var_idx
+ lvi->lvi_loop[depth].var_count - 1); + lvi->lvi_loop[depth].var_count - 1);
ga.ga_len = STRLEN(ga.ga_data); ga.ga_len = (int)STRLEN(ga.ga_data);
} }
return ga.ga_data; return ga.ga_data;
} }

6
src/vim9expr.c
View File

@@ -496,6 +496,7 @@ compile_load(
int idx; int idx;
int gen_load = FALSE; int gen_load = FALSE;
int gen_load_outer = 0; int gen_load_outer = 0;
int outer_loop_depth = -1;
int outer_loop_idx = -1; int outer_loop_idx = -1;
name = vim_strnsave(*arg, end - *arg); name = vim_strnsave(*arg, end - *arg);
@@ -521,6 +522,7 @@ compile_load(
{ {
type = lvar.lv_type; type = lvar.lv_type;
idx = lvar.lv_idx; idx = lvar.lv_idx;
outer_loop_depth = lvar.lv_loop_depth;
outer_loop_idx = lvar.lv_loop_idx; outer_loop_idx = lvar.lv_loop_idx;
if (lvar.lv_from_outer != 0) if (lvar.lv_from_outer != 0)
gen_load_outer = lvar.lv_from_outer; gen_load_outer = lvar.lv_from_outer;
@@ -546,8 +548,8 @@ compile_load(
res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type); res = generate_LOAD(cctx, ISN_LOAD, idx, NULL, type);
if (gen_load_outer > 0) if (gen_load_outer > 0)
{ {
res = generate_LOADOUTER(cctx, idx, res = generate_LOADOUTER(cctx, idx, gen_load_outer,
gen_load_outer, outer_loop_idx, type); outer_loop_depth, outer_loop_idx, type);
cctx->ctx_outer_used = TRUE; cctx->ctx_outer_used = TRUE;
} }
} }