thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.1467: Vim9: :echomsg doesn't like a dict argument

Browse Source 
Problem:    Vim9: :echomsg doesn't like a dict argument.
Solution:   Convert arguments like in legacy script. (closes #6717)
This commit is contained in:
Bram Moolenaar 2020-08-16 18:29:35 +02:00
parent cc673e746a
commit e5abf7af08
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_vim9_script.vim
View File

@ -2102,6 +2102,9 @@ def Test_execute_cmd()
execute 'echomsg' (n ? '"true"' : '"no"') execute 'echomsg' (n ? '"true"' : '"no"')
assert_match('^true$', Screenline(&lines)) assert_match('^true$', Screenline(&lines))
echomsg [1, 2, 3] #{a: 1, b: 2}
assert_match('^\[1, 2, 3\] {''a'': 1, ''b'': 2}$', Screenline(&lines))
call CheckDefFailure(['execute xxx'], 'E1001:') call CheckDefFailure(['execute xxx'], 'E1001:')
call CheckDefFailure(['execute "cmd"# comment'], 'E488:') call CheckDefFailure(['execute "cmd"# comment'], 'E488:')
enddef enddef

2
src/version.c
View File

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

7
src/vim9compile.c
View File

@ -2422,9 +2422,6 @@ compile_list(char_u **arg, cctx_T *cctx)
if (*p == ']') if (*p == ']')
{ {
++p; ++p;
// Allow for following comment, after at least one space.
if (VIM_ISWHITE(*p) && *skipwhite(p) == '#')
p += STRLEN(p);
break; break;
} }
if (compile_expr0(&p, cctx) == FAIL) if (compile_expr0(&p, cctx) == FAIL)
@ -6206,6 +6203,7 @@ compile_throw(char_u *arg, cctx_T *cctx UNUSED)
compile_mult_expr(char_u *arg, int cmdidx, cctx_T *cctx) compile_mult_expr(char_u *arg, int cmdidx, cctx_T *cctx)
{ {
char_u *p = arg; char_u *p = arg;
char_u *prev;
int count = 0; int count = 0;
for (;;) for (;;)
@ -6213,8 +6211,9 @@ compile_mult_expr(char_u *arg, int cmdidx, cctx_T *cctx)
if (compile_expr0(&p, cctx) == FAIL) if (compile_expr0(&p, cctx) == FAIL)
return NULL; return NULL;
++count; ++count;
prev = p;
p = skipwhite(p); p = skipwhite(p);
if (ends_excmd(*p)) if (ends_excmd2(prev, p))
break; break;
} }

20
src/vim9execute.c
View File

@ -1028,14 +1028,20 @@ call_def_function(
for (idx = 0; idx < count; ++idx) for (idx = 0; idx < count; ++idx)
{ {
tv = STACK_TV_BOT(idx - count); tv = STACK_TV_BOT(idx - count);
if (tv->v_type == VAR_CHANNEL || tv->v_type == VAR_JOB) if (iptr->isn_type == ISN_EXECUTE)
{ {
SOURCING_LNUM = iptr->isn_lnum; if (tv->v_type == VAR_CHANNEL
emsg(_(e_inval_string)); || tv->v_type == VAR_JOB)
break; {
SOURCING_LNUM = iptr->isn_lnum;
emsg(_(e_inval_string));
break;
}
else
p = tv_get_string_buf(tv, buf);
} }
else else
p = tv_get_string_buf(tv, buf); p = tv_stringify(tv, buf);
len = (int)STRLEN(p); len = (int)STRLEN(p);
if (ga_grow(&ga, len + 2) == FAIL) if (ga_grow(&ga, len + 2) == FAIL)
@ -1050,8 +1056,10 @@ call_def_function(
clear_tv(tv); clear_tv(tv);
} }
ectx.ec_stack.ga_len -= count; ectx.ec_stack.ga_len -= count;
if (failed)
goto on_error;
if (!failed && ga.ga_data != NULL) if (ga.ga_data != NULL)
{ {
if (iptr->isn_type == ISN_EXECUTE) if (iptr->isn_type == ISN_EXECUTE)
do_cmdline_cmd((char_u *)ga.ga_data); do_cmdline_cmd((char_u *)ga.ga_data);