aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -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

17
src/testdir/test_vim9_func.vim
View File

@@ -2316,6 +2316,23 @@ def Test_legacy_lambda()
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
enddef enddef
def Test_legacy()
var lines =<< trim END
vim9script
func g:LegacyFunction()
let g:legacyvar = 1
endfunc
def Testit()
legacy call g:LegacyFunction()
enddef
Testit()
assert_equal(1, g:legacyvar)
unlet g:legacyvar
delfunc g:LegacyFunction
END
CheckScriptSuccess(lines)
enddef
def Test_legacy_errors() def Test_legacy_errors()
for cmd in ['if', 'elseif', 'else', 'endif', for cmd in ['if', 'elseif', 'else', 'endif',
'for', 'endfor', 'continue', 'break', 'for', 'endfor', 'continue', 'break',

2
src/version.c
View File

@@ -755,6 +755,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 */
/**/
3052,
/**/ /**/
3051, 3051,
/**/ /**/

42
src/vim9compile.c
View File

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