0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 8.2.3239: Vim9: no error using heredoc for a number variable

Problem:    Vim9: no error using heredoc for a number variable.
Solution:   Add a type check. (closes #8627)
This commit is contained in:
Bram Moolenaar
2021-07-28 21:25:49 +02:00
parent d47c39775b
commit 81530e3603
4 changed files with 22 additions and 1 deletions

View File

@@ -817,6 +817,7 @@ ex_let(exarg_T *eap)
else if (expr[0] == '=' && expr[1] == '<' && expr[2] == '<')
{
list_T *l;
long cur_lnum = SOURCING_LNUM;
// HERE document
l = heredoc_get(eap, expr + 3, FALSE);
@@ -825,6 +826,8 @@ ex_let(exarg_T *eap)
rettv_list_set(&rettv, l);
if (!eap->skip)
{
// errors are for the assignment, not the end marker
SOURCING_LNUM = cur_lnum;
op[0] = '=';
op[1] = NUL;
(void)ex_let_vars(eap->arg, &rettv, FALSE, semicolon, var_count,

View File

@@ -1392,6 +1392,14 @@ def Test_heredoc()
[END]
CheckScriptFailure(lines, 'E1145: Missing heredoc end marker: END')
delfunc! g:Func
lines =<< trim END
var lines: number =<< trim STOP
aaa
bbb
STOP
END
CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected number but got list<string>', 1)
enddef
def Test_var_func_call()

View File

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

View File

@@ -6875,7 +6875,15 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
if (compile_assign_lhs(var_start, &lhs, cmdidx,
is_decl, heredoc, oplen, cctx) == FAIL)
goto theend;
if (!heredoc)
if (heredoc)
{
SOURCING_LNUM = start_lnum;
if (lhs.lhs_has_type
&& need_type(&t_list_string, lhs.lhs_type,
-1, 0, cctx, FALSE, FALSE) == FAIL)
goto theend;
}
else
{
if (cctx->ctx_skip == SKIP_YES)
{