aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.3052: Vim9: "legacy call" does not work

Browse Source 
Problem:    Vim9: "legacy call" does not work.
Solution:   Do not skip "call" after "legacy". (closes #8454)
This commit is contained in:
Bram Moolenaar
2021-06-26 13:00:49 +02:00
parent 444d878324
commit ce024c3e20
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/vim9compile.c
View File

@@ -9346,27 +9346,30 @@ compile_def_function(
break;
}
// Skip ":call" to get to the function name.
// Skip ":call" to get to the function name, unless using :legacy
p = ea.cmd;
if (checkforcmd(&ea.cmd, "call", 3))
if (!(local_cmdmod.cmod_flags & CMOD_LEGACY))
{
if (*ea.cmd == '(')
// not for "call()"
ea.cmd = p;
else
ea.cmd = skipwhite(ea.cmd);
}
if (checkforcmd(&ea.cmd, "call", 3))
{
if (*ea.cmd == '(')
// not for "call()"
ea.cmd = p;
else
ea.cmd = skipwhite(ea.cmd);
}
if (!starts_with_colon)
{
int assign;
if (!starts_with_colon)
{
int assign;
// Check for assignment after command modifiers.
assign = may_compile_assignment(&ea, &line, &cctx);
if (assign == OK)
goto nextline;
if (assign == FAIL)
goto erret;
// Check for assignment after command modifiers.
assign = may_compile_assignment(&ea, &line, &cctx);
if (assign == OK)
goto nextline;
if (assign == FAIL)
goto erret;
}
}
/*
@@ -9375,8 +9378,9 @@ compile_def_function(
* "++nr" and "--nr" are eval commands
*/
cmd = ea.cmd;
if (starts_with_colon || !(*cmd == '\''
|| (cmd[0] == cmd[1] && (*cmd == '+' || *cmd == '-'))))
if (!(local_cmdmod.cmod_flags & CMOD_LEGACY)
&& (starts_with_colon || !(*cmd == '\''
|| (cmd[0] == cmd[1] && (*cmd == '+' || *cmd == '-')))))
{
ea.cmd = skip_range(ea.cmd, TRUE, NULL);
if (ea.cmd > cmd)