qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 21:20:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Improve integral value extraction readability

Browse source
This commit is contained in:
Bill Currie 2020-03-17 10:55:27 +09:00
parent 888192a9ea
commit e4a403bbb3
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1039,13 +1039,16 @@ expr_quaternion (expr_t *e)
int int
is_integer_val (expr_t *e) is_integer_val (expr_t *e)
{ {
if (e->type == ex_nil) if (e->type == ex_nil) {
return 1; return 1;
if (e->type == ex_value && e->e.value->lltype == ev_integer) }
if (e->type == ex_value && e->e.value->lltype == ev_integer) {
return 1; return 1;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
&& (e->e.symbol->type->type == ev_integer && is_integral (e->e.symbol->type)) {
|| is_enum (e->e.symbol->type))) return 1;
}
return 1; return 1;
return 0; return 0;
} }
@ -1053,61 +1056,75 @@ is_integer_val (expr_t *e)
int int
expr_integer (expr_t *e) expr_integer (expr_t *e)
{ {
if (e->type == ex_nil) if (e->type == ex_nil) {
return 0; return 0;
if (e->type == ex_value && e->e.value->lltype == ev_integer) }
if (e->type == ex_value && e->e.value->lltype == ev_integer) {
return e->e.value->v.integer_val; return e->e.value->v.integer_val;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
&& (e->e.symbol->type->type == ev_integer && (e->e.symbol->type->type == ev_integer
|| is_enum (e->e.symbol->type))) || is_enum (e->e.symbol->type))) {
return e->e.symbol->s.value->v.integer_val; return e->e.symbol->s.value->v.integer_val;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
&& e->e.symbol->s.def->constant && e->e.symbol->s.def->constant
&& is_integral (e->e.symbol->s.def->type)) && is_integral (e->e.symbol->s.def->type)) {
return D_INT (e->e.symbol->s.def); return D_INT (e->e.symbol->s.def);
}
internal_error (e, "not an integer constant"); internal_error (e, "not an integer constant");
} }
unsigned unsigned
expr_uinteger (expr_t *e) expr_uinteger (expr_t *e)
{ {
if (e->type == ex_nil) if (e->type == ex_nil) {
return 0; return 0;
if (e->type == ex_value && e->e.value->lltype == ev_uinteger) }
if (e->type == ex_value && e->e.value->lltype == ev_uinteger) {
return e->e.value->v.uinteger_val; return e->e.value->v.uinteger_val;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
&& e->e.symbol->type->type == ev_uinteger) && e->e.symbol->type->type == ev_uinteger) {
return e->e.symbol->s.value->v.uinteger_val; return e->e.symbol->s.value->v.uinteger_val;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var if (e->type == ex_symbol && e->e.symbol->sy_type == sy_var
&& e->e.symbol->s.def->constant && e->e.symbol->s.def->constant
&& is_integral (e->e.symbol->s.def->type)) && is_integral (e->e.symbol->s.def->type)) {
return D_INT (e->e.symbol->s.def); return D_INT (e->e.symbol->s.def);
}
internal_error (e, "not an unsigned constant"); internal_error (e, "not an unsigned constant");
} }
int int
is_short_val (expr_t *e) is_short_val (expr_t *e)
{ {
if (e->type == ex_nil) if (e->type == ex_nil) {
return 1; return 1;
if (e->type == ex_value && e->e.value->lltype == ev_short) }
if (e->type == ex_value && e->e.value->lltype == ev_short) {
return 1; return 1;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
&& e->e.symbol->type->type == ev_short) && e->e.symbol->type->type == ev_short) {
return 1; return 1;
}
return 0; return 0;
} }
short short
expr_short (expr_t *e) expr_short (expr_t *e)
{ {
if (e->type == ex_nil) if (e->type == ex_nil) {
return 0; return 0;
if (e->type == ex_value && e->e.value->lltype == ev_short) }
if (e->type == ex_value && e->e.value->lltype == ev_short) {
return e->e.value->v.short_val; return e->e.value->v.short_val;
}
if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const if (e->type == ex_symbol && e->e.symbol->sy_type == sy_const
&& e->e.symbol->type->type == ev_short) && e->e.symbol->type->type == ev_short) {
return e->e.symbol->s.value->v.short_val; return e->e.symbol->s.value->v.short_val;
}
internal_error (e, "not a short constant"); internal_error (e, "not a short constant");
} }