patch 8.2.2210: Vim9: allocating a type to set TTFLAG_BOOL_OK

Problem:    Vim9: allocating a type to set TTFLAG_BOOL_OK.
Solution:   Add t_number_bool.

diff --git a/src/globals.h b/src/globals.h
index d7887bb625667ac802a8dc8cff677fee22b8f16f..39ef83e495670d05f43c857f97c7841cfe796e1f 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -403,6 +403,7 @@ EXTERN type_T t_void INIT6(VAR_VOID, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_bool INIT6(VAR_BOOL, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_special INIT6(VAR_SPECIAL, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_number INIT6(VAR_NUMBER, 0, 0, TTFLAG_STATIC, NULL, NULL);
+EXTERN type_T t_number_bool INIT6(VAR_NUMBER, 0, 0, TTFLAG_STATIC|TTFLAG_BOOL_OK, NULL, NULL);
 EXTERN type_T t_float INIT6(VAR_FLOAT, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_string INIT6(VAR_STRING, 0, 0, TTFLAG_STATIC, NULL, NULL);
 EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, TTFLAG_STATIC, NULL, NULL);

diff --git a/src/version.c b/src/version.c
index ba291afe717b2c48c0bb3fd936c3b5ccc6052e58..018bfd52aa98304605d613b5622f996aa7be372d 100644 (file)
--- 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 */
+/**/
+    2210,
 /**/
     2209,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index fdc805b48e06f54ec8733786ea096800faf19ec6..53a61051cbc77bd432b34e379a06c384a9c1b845 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -931,17 +931,8 @@ generate_PUSHNR(cctx_T *cctx, varnumber_T number)
     isn->isn_arg.number = number;
 
     if (number == 0 || number == 1)
-    {
-       type_T  *type = get_type_ptr(cctx->ctx_type_list);
-
        // A 0 or 1 number can also be used as a bool.
-       if (type != NULL)
-       {
-           type->tt_type = VAR_NUMBER;
-           type->tt_flags = TTFLAG_BOOL_OK;
-           ((type_T **)stack->ga_data)[stack->ga_len - 1] = type;
-       }
-    }
+       ((type_T **)stack->ga_data)[stack->ga_len - 1] = &t_number_bool;
     return OK;
 }
 

diff --git a/src/vim9type.c b/src/vim9type.c
index 4ea32a7fe1000b7ac4aeec0789b821351fbc3e3c..7d8df695f494817d1acf70efee3cead0b3144820 100644 (file)
--- a/src/vim9type.c
+++ b/src/vim9type.c
@@ -376,18 +376,9 @@ typval2type(typval_T *tv, garray_T *type_gap)
     if (type != NULL && type != &t_bool
            && (tv->v_type == VAR_NUMBER
                    && (tv->vval.v_number == 0 || tv->vval.v_number == 1)))
-    {
-       type_T *newtype = get_type_ptr(type_gap);
-
-       // Number 0 and 1 and expression with "&&" or "||" can also be used
-       // for bool.
-       if (newtype != NULL)
-       {
-           *newtype = *type;
-           newtype->tt_flags = TTFLAG_BOOL_OK;
-           type = newtype;
-       }
-    }
+       // Number 0 and 1 and expression with "&&" or "||" can also be used for
+       // bool.
+       type = &t_number_bool;
     return type;
 }