aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2210: Vim9: allocating a type to set TTFLAG_BOOL_OK

Browse Source 
Problem:    Vim9: allocating a type to set TTFLAG_BOOL_OK.
Solution:   Add t_number_bool.
This commit is contained in:
Bram Moolenaar 2020-12-25 13:20:41 +01:00
parent 9e68c32563
commit 3868f59466
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@ -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_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_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 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_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_string INIT6(VAR_STRING, 0, 0, TTFLAG_STATIC, NULL, NULL);
EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, TTFLAG_STATIC, NULL, NULL); EXTERN type_T t_blob INIT6(VAR_BLOB, 0, 0, TTFLAG_STATIC, NULL, NULL);

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
2210,
/**/ /**/
2209, 2209,
/**/ /**/

11
src/vim9compile.c
View File

@ -931,17 +931,8 @@ generate_PUSHNR(cctx_T *cctx, varnumber_T number)
isn->isn_arg.number = number; isn->isn_arg.number = number;
if (number == 0 || number == 1) 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. // A 0 or 1 number can also be used as a bool.
if (type != NULL) ((type_T **)stack->ga_data)[stack->ga_len - 1] = &t_number_bool;
{
type->tt_type = VAR_NUMBER;
type->tt_flags = TTFLAG_BOOL_OK;
((type_T **)stack->ga_data)[stack->ga_len - 1] = type;
}
}
return OK; return OK;
} }

15
src/vim9type.c
View File

@ -376,18 +376,9 @@ typval2type(typval_T *tv, garray_T *type_gap)
if (type != NULL && type != &t_bool if (type != NULL && type != &t_bool
&& (tv->v_type == VAR_NUMBER && (tv->v_type == VAR_NUMBER
&& (tv->vval.v_number == 0 || tv->vval.v_number == 1))) && (tv->vval.v_number == 0 || tv->vval.v_number == 1)))
{ // Number 0 and 1 and expression with "&&" or "||" can also be used for
type_T *newtype = get_type_ptr(type_gap); // bool.
type = &t_number_bool;
// 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;
}
}
return type; return type;
} }