1
0
forked from aniani/vim

patch 9.0.1625: "super" is not considered a reserved name

Problem:    "super" is not considered a reserved name.
Solution:   Add "super" to the list of reserved names. (closes #12515)
This commit is contained in:
Bram Moolenaar 2023-06-10 19:00:12 +01:00
parent 5ca05fa59e
commit ce723f3918
4 changed files with 31 additions and 5 deletions

View File

@ -311,6 +311,8 @@ def Test_reserved_name()
for name in ['true', for name in ['true',
'false', 'false',
'this',
'super',
'null', 'null',
'null_blob', 'null_blob',
'null_dict', 'null_dict',
@ -322,6 +324,15 @@ def Test_reserved_name()
v9.CheckDefExecAndScriptFailure(['var ' .. name .. ' = 0'], 'E1034:') v9.CheckDefExecAndScriptFailure(['var ' .. name .. ' = 0'], 'E1034:')
v9.CheckDefExecAndScriptFailure(['var ' .. name .. ': bool'], 'E1034:') v9.CheckDefExecAndScriptFailure(['var ' .. name .. ': bool'], 'E1034:')
endfor endfor
var lines =<< trim END
vim9script
def Foo(super: bool)
echo 'something'
enddef
defcompile
END
v9.CheckScriptFailure(lines, 'E1034:')
enddef enddef
def Test_null_values() def Test_null_values()
@ -1526,6 +1537,7 @@ def Test_assignment_failure()
v9.CheckDefFailure(['var false = 1'], 'E1034:') v9.CheckDefFailure(['var false = 1'], 'E1034:')
v9.CheckDefFailure(['var null = 1'], 'E1034:') v9.CheckDefFailure(['var null = 1'], 'E1034:')
v9.CheckDefFailure(['var this = 1'], 'E1034:') v9.CheckDefFailure(['var this = 1'], 'E1034:')
v9.CheckDefFailure(['var super = 1'], 'E1034:')
v9.CheckDefFailure(['[a; b; c] = g:list'], 'E1001:') v9.CheckDefFailure(['[a; b; c] = g:list'], 'E1001:')
v9.CheckDefFailure(['var [a; b; c] = g:list'], 'E1080:') v9.CheckDefFailure(['var [a; b; c] = g:list'], 'E1080:')

View File

@ -86,12 +86,23 @@ one_function_arg(
return arg; return arg;
} }
// Vim9 script: cannot use script var name for argument. In function: also // Extra checks in Vim9 script.
// check local vars and arguments. if (!skip && argtypes != NULL)
if (!skip && argtypes != NULL && check_defined(arg, p - arg, {
int c = *p;
*p = NUL;
int r = check_reserved_name(arg, FALSE);
*p = c;
if (r == FAIL)
return arg;
// Cannot use script var name for argument. In function: also check
// local vars and arguments.
if (check_defined(arg, p - arg,
evalarg == NULL ? NULL : evalarg->eval_cctx, evalarg == NULL ? NULL : evalarg->eval_cctx,
eap == NULL ? NULL : eap->cstack, TRUE) == FAIL) eap == NULL ? NULL : eap->cstack, TRUE) == FAIL)
return arg; return arg;
}
if (newargs != NULL && ga_grow(newargs, 1) == FAIL) if (newargs != NULL && ga_grow(newargs, 1) == FAIL)
return arg; return arg;

View File

@ -695,6 +695,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 */
/**/
1625,
/**/ /**/
1624, 1624,
/**/ /**/

View File

@ -1122,6 +1122,7 @@ static char *reserved[] = {
"null_string", "null_string",
"null_channel", "null_channel",
"null_job", "null_job",
"super",
"this", "this",
NULL NULL
}; };