From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 20 Nov 2020 17:59:19 +0000 (+0100)
Subject: patch 8.2.2020: some compilers do not like the "namespace" argument
X-Git-Tag: v8.2.2020
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bebaa0d5c034eb2c4c4dcac86ae6a859b24d2693;p=vim

patch 8.2.2020: some compilers do not like the "namespace" argument

Problem:    Some compilers do not like the "namespace" argument.
Solution:   Rename to "use_namespace". (closes #7332)
---

diff --git a/src/proto/vim9compile.pro b/src/proto/vim9compile.pro
index 9ed86da9a..a19088bc6 100644
--- a/src/proto/vim9compile.pro
+++ b/src/proto/vim9compile.pro
@@ -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);
 char_u *peek_next_line_from_context(cctx_T *cctx);
 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);
 exptype_T get_compare_type(char_u *p, int *len, int *type_is);
 void error_white_both(char_u *op, int len);
diff --git a/src/version.c b/src/version.c
index 70ebd9c18..4fdc0f1c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2020,
 /**/
     2019,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 3057fb1a6..7102d488f 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2767,12 +2767,12 @@ theend:
 /*
  * Find the end of a variable or function name.  Unlike find_name_end() this
  * 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
  * valid name.
  */
     char_u *
-to_name_end(char_u *arg, int namespace)
+to_name_end(char_u *arg, int use_namespace)
 {
     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
 	// and can be used in slice "[n:]".
 	if (*p == ':' && (p != arg + 1
-			     || !namespace
+			     || !use_namespace
 			     || vim_strchr(VIM9_NAMESPACE_CHAR, *arg) == NULL))
 	    break;
     return p;