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

Treat entities a bit like structures in field_expr ().

Browse source 
Look in the entity field symbol table for the field before looking in the
normal symbol table. This allows entity fields to be accessed even when
the current scope has symbol of the same name. However, checking the
normal symbol table where there is no such field allows for field
variables when I get around to implementing them.
This commit is contained in:
Bill Currie 2011-03-08 19:28:11 +09:00
parent 505bde308e
commit 7198be5726
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -877,7 +877,7 @@ get_struct_field (type_t *t1, expr_t *e1, expr_t *e2)
return 0;
}
field = symtab_lookup (strct, sym->name);
if (!field) {
if (!field && t1 != &type_entity) {
error (e2, "'%s' has no member named '%s'", t1->name + 4, sym->name);
e1->type = ex_error;
}
@ -894,13 +894,24 @@ field_expr (expr_t *e1, expr_t *e2)
return e1;
t1 = get_type (e1);
if (t1->type == ev_entity) {
t2 = get_type (e2);
if (e2->type == ex_error)
return e2;
if (t2->type == ev_field) {
symbol_t *field = 0;
if (e2->type == ex_symbol)
field = get_struct_field (&type_entity, e1, e2);
if (field) {
e2 = new_field_expr (0, field->type, field->s.def);
e = new_binary_expr ('.', e1, e2);
e->e.expr.type = t2->t.fldptr.type;
e->e.expr.type = field->type;
return e;
} else {
t2 = get_type (e2);
if (e2->type == ex_error)
return e2;
if (t2->type == ev_field) {
e = new_binary_expr ('.', e1, e2);
e->e.expr.type = t2->t.fldptr.type;
return e;
}
}
} else if (t1->type == ev_pointer) {
if (is_struct (t1->t.fldptr.type)) {

1
tools/qfcc/source/type.c
View file

@ -867,6 +867,7 @@ chain_initial_types (void)
chain_type (&type_string);
chain_type (&type_float);
chain_type (&type_vector);
type_entity.t.symtab = pr.entity_fields;
chain_type (&type_entity);
chain_type (&type_field);
chain_type (&type_function);