adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1279: Vim9: null_object and null_class are no reserved names

Browse Source 
Problem:  Vim9: null_object and null_class are no reserved names
Solution: Add null_object and null_class as reserved names.
          (Yegappan Lakshmanan)

closes: #17054

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-04-05 16:00:22 +02:00
committed by Christian Brabandt
parent d22f43111b
commit 8daae6fea9
5 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/vim9script.c
View File

@ -1119,36 +1119,52 @@ check_script_var_type(
}
// words that cannot be used as a variable
// Keep this array sorted, as bsearch() is used to search this array.
static char *reserved[] = {
"true",
"false",
"null",
"null_blob",
"null_channel",
"null_class",
"null_dict",
"null_function",
"null_job",
"null_list",
"null_tuple",
"null_object",
"null_partial",
"null_string",
"null_channel",
"null_job",
"null_tuple",
"super",
"this",
NULL
"true",
};
/*
* String compare function used for bsearch()
*/
static int
comp_names(const void *s1, const void *s2)
{
return STRCMP(*(char **)s1, *(char **)s2);
}
/*
* Returns OK if "name" is not a reserved keyword. Otherwise returns FAIL.
*/
int
check_reserved_name(char_u *name, int is_objm_access)
{
int idx;
// "this" can be used in an object method
if (is_objm_access && STRCMP("this", name) == 0)
return OK;
if (bsearch(&name, reserved, ARRAY_LENGTH(reserved),
sizeof(reserved[0]), comp_names) != NULL)
{
semsg(_(e_cannot_use_reserved_name_str), name);
return FAIL;
}
for (idx = 0; reserved[idx] != NULL; ++idx)
if (STRCMP(reserved[idx], name) == 0
&& !(STRCMP("this", name) == 0 && is_objm_access))
{
semsg(_(e_cannot_use_reserved_name_str), name);
return FAIL;
}
return OK;
}