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.2020: some compilers do not like the "namespace" argument

Browse Source 
Problem:    Some compilers do not like the "namespace" argument.
Solution:   Rename to "use_namespace". (closes #7332)
This commit is contained in:
Bram Moolenaar
2020-11-20 18:59:19 +01:00
parent 80d868ec25
commit bebaa0d5c0
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto/vim9compile.pro
View File

@@ -8,7 +8,7 @@ imported_T *find_imported_in_script(char_u *name, size_t len, int sid);
int vim9_comment_start(char_u *p); int vim9_comment_start(char_u *p);
char_u *peek_next_line_from_context(cctx_T *cctx); char_u *peek_next_line_from_context(cctx_T *cctx);
char_u *next_line_from_context(cctx_T *cctx, int skip_comment); char_u *next_line_from_context(cctx_T *cctx, int skip_comment);
char_u *to_name_end(char_u *arg, int namespace); char_u *to_name_end(char_u *arg, int use_namespace);
char_u *to_name_const_end(char_u *arg); char_u *to_name_const_end(char_u *arg);
exptype_T get_compare_type(char_u *p, int *len, int *type_is); exptype_T get_compare_type(char_u *p, int *len, int *type_is);
void error_white_both(char_u *op, int len); void error_white_both(char_u *op, int len);

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2020,
/**/ /**/
2019, 2019,
/**/ /**/

6
src/vim9compile.c
View File

@@ -2767,12 +2767,12 @@ theend:
/* /*
* Find the end of a variable or function name. Unlike find_name_end() this * Find the end of a variable or function name. Unlike find_name_end() this
* does not recognize magic braces. * does not recognize magic braces.
* When "namespace" is TRUE recognize "b:", "s:", etc. * When "use_namespace" is TRUE recognize "b:", "s:", etc.
* Return a pointer to just after the name. Equal to "arg" if there is no * Return a pointer to just after the name. Equal to "arg" if there is no
* valid name. * valid name.
*/ */
char_u * char_u *
to_name_end(char_u *arg, int namespace) to_name_end(char_u *arg, int use_namespace)
{ {
char_u *p; char_u *p;
@@ -2784,7 +2784,7 @@ to_name_end(char_u *arg, int namespace)
// Include a namespace such as "s:var" and "v:var". But "n:" is not // Include a namespace such as "s:var" and "v:var". But "n:" is not
// and can be used in slice "[n:]". // and can be used in slice "[n:]".
if (*p == ':' && (p != arg + 1 if (*p == ':' && (p != arg + 1
|| !namespace || !use_namespace
|| vim_strchr(VIM9_NAMESPACE_CHAR, *arg) == NULL)) || vim_strchr(VIM9_NAMESPACE_CHAR, *arg) == NULL))
break; break;
return p; return p;