patch 8.2.1455: Vim9: crash when using typecast before constant
Problem: Vim9: crash when using typecast before constant.
Solution: Generate constant before checking type. Add tets.
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index fb07586..38a3326 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1324,6 +1324,12 @@
def Test_expr7t()
let ls: list<string> = ['a', <string>g:string_empty]
let ln: list<number> = [<number>g:anint, <number>g:alsoint]
+ let nr = <number>234
+ assert_equal(234, nr)
+
+ call CheckDefFailure(["let x = <nr>123"], 'E1010:')
+ call CheckDefFailure(["let x = <number >123"], 'E1068:')
+ call CheckDefFailure(["let x = <number 123"], 'E1104:')
enddef
" test low level expression
diff --git a/src/version.c b/src/version.c
index e6d929e..e873a9c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1455,
+/**/
1454,
/**/
1453,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 5c4547d..9206284 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3501,11 +3501,12 @@
if (want_type != NULL)
{
garray_T *stack = &cctx->ctx_type_stack;
- type_T *actual = ((type_T **)stack->ga_data)[stack->ga_len - 1];
+ type_T *actual;
+ generate_ppconst(cctx, ppconst);
+ actual = ((type_T **)stack->ga_data)[stack->ga_len - 1];
if (check_type(want_type, actual, FALSE) == FAIL)
{
- generate_ppconst(cctx, ppconst);
if (need_type(actual, want_type, -1, cctx, FALSE) == FAIL)
return FAIL;
}
@@ -5016,6 +5017,7 @@
goto theend;
if (*skipwhite(p) != ']')
{
+ // this should not happen
emsg(_(e_missbrac));
goto theend;
}