qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

catch ! == bogosity

Browse source
This commit is contained in:
Bill Currie 2003-03-25 17:18:58 +00:00
parent 81cf1cc99d
commit 0550741fb9
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/qfcc/source/expr.c
View file

@ -1411,6 +1411,15 @@ convert_nil (expr_t *e, type_t *t)
e->e.pointer.type = &type_void;
}
static int
is_compare (int op)
{
if (op == OR || op == AND || op == EQ || op == NE || op == LE
|| op == GE || op == LT || op == GT || op == '>' || op == '<')
return 1;
return 0;
}
expr_t *
binary_expr (int op, expr_t *e1, expr_t *e2)
{
@ -1481,7 +1490,7 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
if (e1->type >= ex_string && e2->type >= ex_string)
return binary_const (op, e1, e2);
if ((op == '&' || op == '|')
if ((op == '&' || op == '|' || is_compare (op))
&& e1->type == ex_uexpr && e1->e.expr.op == '!' && !e1->paren) {
if (options.traditional) {
notice (e1, "precedence of `!' and `%c' inverted for traditional "
@ -1538,8 +1547,7 @@ binary_expr (int op, expr_t *e1, expr_t *e2)
} else {
type = t1;
}
if (op == OR || op == AND || op == EQ || op == NE || op == LE
|| op == GE || op == LT || op == GT || op == '>' || op == '<') {
if (is_compare (op)) {
if (options.code.progsversion > PROG_ID_VERSION)
type = &type_integer;
else