qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[cexpr] Fix bool printing and support int casts 

Strangely, valid pointers are always true. Also, bool now accepts 0 for
false and non-0 for true (doing a proper conversion to bool).
This commit is contained in:
Bill Currie 2023-06-30 21:48:22 +09:00
parent 0b0271ee76
commit 09f257cdcb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/util/cexpr-type.c
View File

@ -70,12 +70,19 @@ BINOP(bool, and, bool, &)
BINOP(bool, or, bool, |)
BINOP(bool, xor, bool, ^)
static void
bool_cast_int (const exprval_t *val1, const exprval_t *src, exprval_t *result,
exprctx_t *ctx)
{
*(bool *) result->value = !!*(int *) src->value;
}
UNOP(bool, not, bool, !)
static const char *
bool_get_string (const exprval_t *val, va_ctx_t *va_ctx)
{
return val->value ? "true" : "false";
return *(bool *) val->value ? "true" : "false";
}
binop_t bool_binops[] = {
@ -83,6 +90,7 @@ binop_t bool_binops[] = {
{ '|', &cexpr_bool, &cexpr_bool, bool_or },
{ '^', &cexpr_bool, &cexpr_bool, bool_xor },
{ '=', &cexpr_plitem, &cexpr_bool, cexpr_cast_plitem },
{ '=', &cexpr_int, &cexpr_bool, bool_cast_int },
{}
};