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

Correct construction of type_id.

Browse source
This commit is contained in:
Bill Currie 2011-02-06 15:36:21 +09:00
parent e27f3fd7c3
commit c3c693e9c7
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,11 +85,12 @@ type_t type_category;
type_t type_ivar;
type_t type_module;
type_t type_id = { ev_pointer, "id" };
type_t type_object = {ev_invalid, "object", ty_class};
type_t type_id = { ev_pointer, "id", ty_none, {{&type_object}}};
type_t type_Class = { ev_invalid, "Class", ty_class};
type_t type_ClassPtr = { ev_pointer, 0, ty_none, {{&type_Class}}};
type_t type_Protocol = { ev_invalid, "Protocol", ty_class};
class_t class_id = {1, "id"};
class_t class_object = {1, "id"};
class_t class_Class = {1, "Class"};
class_t class_Protocol = {1, "Protocol"};
@ -262,12 +263,12 @@ init_classes (void)
class_Protocol.ivars = sym->type->t.symtab;
class_Protocol.type = &type_Protocol;
type_id.ty = ty_class;
type_id.t.class = &class_id;
chain_type (&type_id);
type_object.t.class = &class_object;
chain_type (&type_object);
sym = make_structure (0, 's', id_ivars, 0);
class_id.ivars = sym->type->t.symtab;
class_id.type = &type_id;
class_object.ivars = sym->type->t.symtab;
class_object.type = &type_id;
chain_type (&type_id);
}
void

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

@ -828,10 +828,6 @@ type_assignable (type_t *dst, type_t *src)
dst_class = dst->t.class;
src_class = src->t.class;
//printf ("%s %s\n", dst_class->class_name, src_class->class_name);
if (!dst_class || dst_class == &class_id)
return 1;
if (!src_class || src_class == &class_id)
return 1;
while (dst_class != src_class && src_class) {
src_class = src_class->super_class;
//if (src_class)