qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-24 20:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Catch some error expressions

Browse source 
Not really enough in general as an internal error still occurs, but the
triggering error is caused by some broken changes.
This commit is contained in:
Bill Currie 2023-10-02 14:25:06 +09:00
parent 261ea0c4de
commit 471f5488ff
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1493,6 +1493,9 @@ field_expr (const expr_t *e1, const expr_t *e2)
const expr_t *offset = new_short_expr (field->s.offset); const expr_t *offset = new_short_expr (field->s.offset);
e1 = offset_pointer_expr (e1, offset); e1 = offset_pointer_expr (e1, offset);
if (e1->type == ex_error) {
return e1;
}
e1 = cast_expr (pointer_type (field->type), e1); e1 = cast_expr (pointer_type (field->type), e1);
return unary_expr ('.', e1); return unary_expr ('.', e1);
} else if (is_class (t1->t.fldptr.type)) { } else if (is_class (t1->t.fldptr.type)) {
@ -1507,6 +1510,9 @@ field_expr (const expr_t *e1, const expr_t *e2)
const expr_t *offset = new_short_expr (ivar->s.offset); const expr_t *offset = new_short_expr (ivar->s.offset);
e1 = offset_pointer_expr (e1, offset); e1 = offset_pointer_expr (e1, offset);
e1 = cast_expr (pointer_type (ivar->type), e1); e1 = cast_expr (pointer_type (ivar->type), e1);
if (e1->type == ex_error) {
return e1;
}
return unary_expr ('.', e1); return unary_expr ('.', e1);
} }
} else if (is_algebra (t1)) { } else if (is_algebra (t1)) {
@ -2664,6 +2670,9 @@ offset_pointer_expr (const expr_t *pointer, const expr_t *offset)
} else { } else {
ptr = cast_expr (&type_int, pointer); ptr = cast_expr (&type_int, pointer);
} }
if (ptr->type == ex_error) {
return ptr;
}
ptr = binary_expr ('+', ptr, offset); ptr = binary_expr ('+', ptr, offset);
return cast_expr (ptr_type, ptr); return cast_expr (ptr_type, ptr);
} }

3
tools/qfcc/source/expr_obj.c
View file

@ -170,6 +170,9 @@ super_expr (class_type_t *class_type)
e = new_symbol_expr (class_pointer_symbol (class)); e = new_symbol_expr (class_pointer_symbol (class));
e = assign_expr (field_expr (super, new_name_expr ("class")), e = assign_expr (field_expr (super, new_name_expr ("class")),
field_expr (e, new_name_expr ("super_class"))); field_expr (e, new_name_expr ("super_class")));
if (e->type == ex_error) {
return e;
}
append_expr (super_block, e); append_expr (super_block, e);
e = address_expr (super, 0); e = address_expr (super, 0);