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().

diff --git a/src/version.c b/src/version.c
index 8798002603db9c99910e38a28e09215c7230ecba..931a8178575a4f68c2c304a039667fa49463535e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3277,
 /**/
     3276,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index c4eed542896c0ba917ab67c99431d3d431fd7606..c5359fe54df8222f7aa8f4cae02c9c5d67753c72 100644 (file)
--- 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 *eap, cmdidx_T cmdidx, cctx_T *cctx)
        if (oplen > 0 && *op != '=')
        {
            type_T          *expected;
-           type_T          *stacktype;
+           type_T          *stacktype = NULL;
 
            if (*op == '.')
            {