patch 8.2.0283: Vim9: failing to load script var not tested
Problem: Vim9: failing to load script var not tested.
Solution: Add more tests. Fix using s: in old script.
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 8614943..7fe2764 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1513,9 +1513,9 @@
int idx = get_script_item_idx(current_sctx.sc_sid, name, FALSE);
imported_T *import;
- if (idx == -1)
+ if (idx == -1 || si->sn_version != SCRIPT_VERSION_VIM9)
{
- // variable exists but is not in sn_var_vals: old style script.
+ // variable is not in sn_var_vals: old style script.
return generate_OLDSCRIPT(cctx, ISN_LOADS, name, current_sctx.sc_sid,
&t_any);
}
@@ -1627,7 +1627,9 @@
|| (len == 5 && STRNCMP("false", *arg, 5) == 0))
res = generate_PUSHBOOL(cctx, **arg == 't'
? VVAL_TRUE : VVAL_FALSE);
- else
+ else if (SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
+ == SCRIPT_VERSION_VIM9)
+ // in Vim9 script "var" can be script-local.
res = compile_load_scriptvar(cctx, name);
}
}