diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index a55de7e83..a78cf1983 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1370,6 +1370,9 @@ def Test_expr5_list_add() dany[i] = i endfor assert_equal({a: 'a', 12: 12}, dany) + + # result of glob() is "any", runtime type check + var sl: list = glob('*.txt', false, true) + [''] enddef " test multiply, divide, modulo diff --git a/src/version.c b/src/version.c index 2dbf24a64..65a3f5019 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2584, /**/ 2583, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index c78106023..7c1dca533 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4450,7 +4450,7 @@ compile_expr6(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) } /* - * + number addition + * + number addition or list/blobl concatenation * - number subtraction * .. string concatenation */ @@ -4532,6 +4532,7 @@ compile_expr5(char_u **arg, cctx_T *cctx, ppconst_T *ppconst) else { generate_ppconst(cctx, ppconst); + ppconst->pp_is_const = FALSE; if (*op == '.') { if (may_generate_2STRING(-2, cctx) == FAIL