aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.2.3277: Vim9: compiled has() does not work properly

Browse Source 
Problem:    Vim9: compiled has() does not work properly.
Solution:   Fix check for has() vs exists().
This commit is contained in:
Bram Moolenaar
2021-08-02 21:12:05 +02:00
parent bb7ee7abe1
commit c3160727b9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -755,6 +755,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 */
/**/
3277,
/**/ /**/
3276, 3276,
/**/ /**/

9
src/vim9compile.c
View File

@@ -3402,6 +3402,7 @@ compile_call(
{ {
char_u *s = skipwhite(*arg + varlen + 1); char_u *s = skipwhite(*arg + varlen + 1);
typval_T argvars[2]; typval_T argvars[2];
int is_has = **arg == 'h';
argvars[0].v_type = VAR_UNKNOWN; argvars[0].v_type = VAR_UNKNOWN;
if (*s == '"') if (*s == '"')
@@ -3410,8 +3411,8 @@ compile_call(
(void)eval_lit_string(&s, &argvars[0], TRUE); (void)eval_lit_string(&s, &argvars[0], TRUE);
s = skipwhite(s); s = skipwhite(s);
if (*s == ')' && argvars[0].v_type == VAR_STRING if (*s == ')' && argvars[0].v_type == VAR_STRING
&& ((**arg == 'h' && !dynamic_feature(argvars[0].vval.v_string)) && ((is_has && !dynamic_feature(argvars[0].vval.v_string))
|| (**arg == 'e' && (*argvars[0].vval.v_string == '+' || (!is_has && (*argvars[0].vval.v_string == '+'
|| *argvars[0].vval.v_string == '&')))) || *argvars[0].vval.v_string == '&'))))
{ {
typval_T *tv = &ppconst->pp_tv[ppconst->pp_used]; typval_T *tv = &ppconst->pp_tv[ppconst->pp_used];
@@ -3420,7 +3421,7 @@ compile_call(
argvars[1].v_type = VAR_UNKNOWN; argvars[1].v_type = VAR_UNKNOWN;
tv->v_type = VAR_NUMBER; tv->v_type = VAR_NUMBER;
tv->vval.v_number = 0; tv->vval.v_number = 0;
if (**arg == 'h') if (is_has)
f_has(argvars, tv); f_has(argvars, tv);
else else
f_exists(argvars, tv); 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 != '=') if (oplen > 0 && *op != '=')
{ {
type_T *expected; type_T *expected;
type_T *stacktype; type_T *stacktype = NULL;
if (*op == '.') if (*op == '.')
{ {