qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 09:22:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix messages to super.

Browse source
This commit is contained in:
Bill Currie 2011-02-08 17:09:27 +09:00
parent 505e141633
commit 6643c5dd98
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/source/class.c
View file

@ -974,7 +974,7 @@ class_pointer_symbol (class_t *class)
class_type.c.class = class; class_type.c.class = class;
sym = make_symbol (va ("_OBJ_CLASS_POINTER_%s", class->name), sym = make_symbol (va ("_OBJ_CLASS_POINTER_%s", class->name),
pointer_type (class->type), &type_ClassPtr,
pr.far_data, st_static); pr.far_data, st_static);
if (!sym->table) if (!sym->table)
symtab_addsymbol (pr.symtab, sym); symtab_addsymbol (pr.symtab, sym);

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

@ -472,7 +472,7 @@ new_name_expr (const char *name)
sym = symtab_lookup (current_symtab, name); sym = symtab_lookup (current_symtab, name);
if (!sym) if (!sym)
return error (0, "undefined symbol %s", name); sym = new_symbol (name);
e->type = ex_symbol; e->type = ex_symbol;
e->e.symbol = sym; e->e.symbol = sym;
return e; return e;
@ -2503,12 +2503,11 @@ encode_expr (type_t *type)
expr_t * expr_t *
super_expr (class_type_t *class_type) super_expr (class_type_t *class_type)
{ {
def_t *super_d; symbol_t *sym;
expr_t *super; expr_t *super;
expr_t *e; expr_t *e;
expr_t *super_block; expr_t *super_block;
class_t *class; class_t *class;
class_type_t _class_type;
if (!class_type) if (!class_type)
return error (0, "`super' used outside of class implementation"); return error (0, "`super' used outside of class implementation");
@ -2518,17 +2517,20 @@ super_expr (class_type_t *class_type)
if (!class->super_class) if (!class->super_class)
return error (0, "%s has no super class", class->name); return error (0, "%s has no super class", class->name);
super_d = 0;//FIXME get_def (&type_Super, ".super", current_func->scope, st_local); sym = symtab_lookup (current_symtab, ".super");
super = 0; //FIXME new_def_expr (super_d); if (!sym || sym->table != current_symtab) {
sym = new_symbol (".super");
initialize_def (sym, &type_Super, 0, current_symtab->space, st_local);
}
super = new_symbol_expr (sym);
super_block = new_block_expr (); super_block = new_block_expr ();
e = assign_expr (binary_expr ('.', super, new_name_expr ("self")), e = assign_expr (binary_expr ('.', super, new_name_expr ("self")),
new_name_expr ("self")); new_name_expr ("self"));
append_expr (super_block, e); append_expr (super_block, e);
_class_type.type = ct_class; e = new_symbol_expr (class_pointer_symbol (class));
_class_type.c.class = class;
e = new_symbol_expr (class_symbol (&_class_type, 1));
e = assign_expr (binary_expr ('.', super, new_name_expr ("class")), e = assign_expr (binary_expr ('.', super, new_name_expr ("class")),
binary_expr ('.', e, new_name_expr ("super_class"))); binary_expr ('.', e, new_name_expr ("super_class")));
append_expr (super_block, e); append_expr (super_block, e);