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 7.4.1105

Browse Source 
Problem:    When using slices there is a mixup of variable name and namespace.
Solution:   Recognize variables that can't be a namespace. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2016-01-16 16:49:28 +01:00
parent 4e640bd930
commit 9bbf63dbf8
4 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/eval.c
View File

@@ -115,6 +115,8 @@ static char *e_illvar = N_("E461: Illegal variable name: %s");
static char *e_float_as_string = N_("E806: using Float as a String");
#endif
#define NAMESPACE_CHAR (char_u *)"abglstvw"
static dictitem_T globvars_var; /* variable used for g: */
#define globvarht globvardict.dv_hashtab
@@ -20666,7 +20668,17 @@ get_id_len(arg)
/* Find the end of the name. */
for (p = *arg; eval_isnamec(*p); ++p)
;
{
if (*p == ':')
{
/* "s:" is start of "s:var", but "n:" is not and can be used in
* slice "[n:]". Also "xx:" is not a namespace. */
len = (int)(p - *arg);
if ((len == 1 && vim_strchr(NAMESPACE_CHAR, **arg) == NULL)
|| len > 1)
break;
}
}
if (p == *arg) /* no name found */
return 0;
@@ -20766,6 +20778,7 @@ find_name_end(arg, expr_start, expr_end, flags)
int mb_nest = 0;
int br_nest = 0;
char_u *p;
int len;
if (expr_start != NULL)
{
@@ -20801,6 +20814,15 @@ find_name_end(arg, expr_start, expr_end, flags)
if (*p == NUL)
break;
}
else if (br_nest == 0 && mb_nest == 0 && *p == ':')
{
/* "s:" is start of "s:var", but "n:" is not and can be used in
* slice "[n:]". Also "xx:" is not a namespace. */
len = (int)(p - arg);
if ((len == 1 && vim_strchr(NAMESPACE_CHAR, *arg) == NULL)
|| len > 1)
break;
}
if (mb_nest == 0)
{