changeset 30337:dac4fe437840 v9.0.0504

patch 9.0.0504: still a build failure Commit: https://github.com/vim/vim/commit/c9e4a6f1910dea250af69a3774bcf1fee7e7b8f5 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 19 16:08:04 2022 +0100 patch 9.0.0504: still a build failure Problem: still a Build failure. Solution: Add another missing changes. Avoid compiler warning.
author Bram Moolenaar <Bram@vim.org>
date Mon, 19 Sep 2022 17:15:04 +0200
parents cf5fed99ae1e
children 25e5ee65b53a
files src/version.c src/vim9execute.c src/vim9expr.c
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    504,
+/**/
     503,
 /**/
     502,
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -5955,13 +5955,13 @@ printable_loopvarinfo(loopvarinfo_T *lvi
 	if (ga_grow(&ga, 50) == FAIL)
 	    break;
 	if (lvi->lvi_loop[depth].var_idx == 0)
-	    STRCPY(ga.ga_data + ga.ga_len, " -");
+	    STRCPY((char *)ga.ga_data + ga.ga_len, " -");
 	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_count - 1);
-	ga.ga_len = STRLEN(ga.ga_data);
+	ga.ga_len = (int)STRLEN(ga.ga_data);
     }
     return ga.ga_data;
 }
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -496,6 +496,7 @@ compile_load(
 	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,6 +522,7 @@ compile_load(
 	    {
 		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,8 +548,8 @@ compile_load(
 	    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);
+	    res = generate_LOADOUTER(cctx, idx, gen_load_outer,
+				       outer_loop_depth, outer_loop_idx, type);
 	    cctx->ctx_outer_used = TRUE;
 	}
     }