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

Support pointer - pointer.

Browse source
This commit is contained in:
Bill Currie 2012-11-15 13:38:57 +09:00
parent 552142497e
commit f18a4d3c4a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/qfcc/source/constfold.c
View file

@ -448,7 +448,7 @@ static expr_t *
do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
{
type_t *type;
static int valid[] = {'=', PAS, '&', 'M', '.', EQ, NE, 0};
static int valid[] = {'=', PAS, '-', '&', 'M', '.', EQ, NE, 0};
if (is_integral (type = get_type (e2)) && (op == '-' || op == '+')) {
// pointer arithmetic
@ -458,8 +458,20 @@ do_op_pointer (int op, expr_t *e, expr_t *e1, expr_t *e2)
return new_alias_expr (get_type (e1), e);
}
if (!valid_op (op, valid))
return error (e1, "invalid operator for pointer");
return error (e1, "invalid operator for pointer: %s",
get_op_string (op));
if (op == '-') {
type = get_type (e1);
if (type != get_type (e2))
return error (e2, "invalid operands to binary -");
e1 = new_alias_expr (&type_integer, e1);
e2 = new_alias_expr (&type_integer, e2);
e = binary_expr ('-', e1, e2);
if (type_size (type) != 1)
e = binary_expr ('/', e, new_integer_expr (type_size (type)));
return e;
}
if (op == PAS && (type = get_type (e1)->t.fldptr.type) != get_type (e2)) {
// make sure auto-convertions happen
expr_t *tmp = new_temp_def_expr (type);