Mercurial > vim

changeset 25481:a975e2b7ea31 v8.2.3277

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3277: Vim9: compiled has() does not work properly Commit: https://github.com/vim/vim/commit/c3160727b940b762e18fd9431416dc1a4a081c3a Author: Bram Moolenaar <Bram@vim.org> Date: Mon Aug 2 21:12:05 2021 +0200 patch 8.2.3277: Vim9: compiled has() does not work properly Problem: Vim9: compiled has() does not work properly. Solution: Fix check for has() vs exists().
author Bram Moolenaar <Bram@vim.org>
date Mon, 02 Aug 2021 21:15:03 +0200
parents 5435994d0135
children e4e9d42dfd67
files src/version.c src/vim9compile.c
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3277,
+/**/
     3276,
 /**/
     3275,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3402,6 +3402,7 @@ compile_call(
     {
 	char_u	    *s = skipwhite(*arg + varlen + 1);
 	typval_T    argvars[2];
+	int	    is_has = **arg == 'h';
 
 	argvars[0].v_type = VAR_UNKNOWN;
 	if (*s == '"')
@@ -3410,8 +3411,8 @@ compile_call(
 	    (void)eval_lit_string(&s, &argvars[0], TRUE);
 	s = skipwhite(s);
 	if (*s == ')' && argvars[0].v_type == VAR_STRING
-	       && ((**arg == 'h' && !dynamic_feature(argvars[0].vval.v_string))
-		    || (**arg == 'e' && (*argvars[0].vval.v_string == '+'
+	       && ((is_has && !dynamic_feature(argvars[0].vval.v_string))
+		    || (!is_has && (*argvars[0].vval.v_string == '+'
 			    || *argvars[0].vval.v_string == '&'))))
 	{
 	    typval_T	*tv = &ppconst->pp_tv[ppconst->pp_used];
@@ -3420,7 +3421,7 @@ compile_call(
 	    argvars[1].v_type = VAR_UNKNOWN;
 	    tv->v_type = VAR_NUMBER;
 	    tv->vval.v_number = 0;
-	    if (**arg == 'h')
+	    if (is_has)
 		f_has(argvars, tv);
 	    else
 		f_exists(argvars, tv);
@@ -7096,7 +7097,7 @@ compile_assignment(char_u *arg, exarg_T 
 	if (oplen > 0 && *op != '=')
 	{
 	    type_T	    *expected;
-	    type_T	    *stacktype;
+	    type_T	    *stacktype = NULL;
 
 	    if (*op == '.')
 	    {