aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.0626: Vim9: wrong syntax of function in Vim9 script

Browse Source 
Problem:    Vim9: wrong syntax of function in Vim9 script.
Solution:   Give error for missing space. Implement :echomsg and :echoerr.
            (closes #5670)
This commit is contained in:
Bram Moolenaar
2020-04-23 22:16:53 +02:00
parent 1df8b3fb04
commit f93c7fea08
10 changed files with 141 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/vim9execute.c
View File

@@ -668,8 +668,12 @@ call_def_function(
}
break;
// execute :execute {string} ...
// :execute {string} ...
// :echomsg {string} ...
// :echoerr {string} ...
case ISN_EXECUTE:
case ISN_ECHOMSG:
case ISN_ECHOERR:
{
int count = iptr->isn_arg.number;
garray_T ga;
@@ -705,7 +709,30 @@ call_def_function(
ectx.ec_stack.ga_len -= count;
if (!failed && ga.ga_data != NULL)
do_cmdline_cmd((char_u *)ga.ga_data);
{
if (iptr->isn_type == ISN_EXECUTE)
do_cmdline_cmd((char_u *)ga.ga_data);
else
{
msg_sb_eol();
if (iptr->isn_type == ISN_ECHOMSG)
{
msg_attr(ga.ga_data, echo_attr);
out_flush();
}
else
{
int save_did_emsg = did_emsg;
SOURCING_LNUM = iptr->isn_lnum;
emsg(ga.ga_data);
if (!force_abort)
// We don't want to abort following
// commands, restore did_emsg.
did_emsg = save_did_emsg;
}
}
}
ga_clear(&ga);
}
break;
@@ -1947,6 +1974,14 @@ ex_disassemble(exarg_T *eap)
smsg("%4d EXECUTE %lld", current,
(long long)(iptr->isn_arg.number));
break;
case ISN_ECHOMSG:
smsg("%4d ECHOMSG %lld", current,
(long long)(iptr->isn_arg.number));
break;
case ISN_ECHOERR:
smsg("%4d ECHOERR %lld", current,
(long long)(iptr->isn_arg.number));
break;
case ISN_LOAD:
if (iptr->isn_arg.number < 0)
smsg("%4d LOAD arg[%lld]", current,