qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 12:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do some class object type renaming.

Browse source 
type_object -> type_obj_object
type_Class -> type_obj_class
type_ClassPtr -> type_Class

In the process, one more FIXME is gone :)
This commit is contained in:
Bill Currie 2012-11-08 20:58:48 +09:00
parent 07e67da838
commit eb86a66ce5
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/qfcc/include/class.h
View file

@ -83,8 +83,9 @@ typedef struct protocollist_s {
} protocollist_t; } protocollist_t;
extern struct type_s type_id; extern struct type_s type_id;
extern struct type_s type_obj_object;
extern struct type_s type_obj_class;
extern struct type_s type_Class; extern struct type_s type_Class;
extern struct type_s type_ClassPtr;
extern struct type_s type_Protocol; extern struct type_s type_Protocol;
extern struct type_s type_SEL; extern struct type_s type_SEL;
extern struct type_s type_IMP; extern struct type_s type_IMP;

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

@ -84,10 +84,10 @@ type_t type_moduleptr = { ev_pointer, 0, ty_none, {{&type_module}}};
type_t type_obj_exec_class = { ev_func, 0, ty_none, type_t type_obj_exec_class = { ev_func, 0, ty_none,
{{&type_void, 1, { &type_moduleptr }}}}; {{&type_void, 1, { &type_moduleptr }}}};
type_t type_object = {ev_invalid, "object", ty_class}; type_t type_obj_object = {ev_invalid, "obj_object", ty_class};
type_t type_id = { ev_pointer, "id", ty_none, {{&type_object}}}; type_t type_id = { ev_pointer, "id", ty_none, {{&type_obj_object}}};
type_t type_Class = { ev_invalid, "Class", ty_class}; type_t type_obj_class = { ev_invalid, "obj_class", ty_class};
type_t type_ClassPtr = { ev_pointer, 0, ty_none, {{&type_Class}}}; type_t type_Class = { ev_pointer, 0, ty_none, {{&type_obj_class}}};
type_t type_Protocol = { ev_invalid, "Protocol", ty_class}; type_t type_Protocol = { ev_invalid, "Protocol", ty_class};
class_t class_object = {1, "id"}; class_t class_object = {1, "id"};
@ -133,7 +133,7 @@ static struct_def_t ivar_struct[] = {
static struct_def_t super_struct[] = { static struct_def_t super_struct[] = {
{"self", &type_id}, {"self", &type_id},
{"class", &type_ClassPtr}, {"class", &type_Class},
{0, 0} {0, 0}
}; };
@ -146,8 +146,8 @@ static struct_def_t module_struct[] = {
}; };
static struct_def_t class_ivars[] = { static struct_def_t class_ivars[] = {
{"class_pointer", &type_ClassPtr}, {"class_pointer", &type_Class},
{"super_class", &type_ClassPtr}, {"super_class", &type_Class},
{"name", &type_string}, {"name", &type_string},
{"version", &type_integer}, {"version", &type_integer},
{"info", &type_integer}, {"info", &type_integer},
@ -163,7 +163,7 @@ static struct_def_t class_ivars[] = {
}; };
static struct_def_t protocol_ivars[] = { static struct_def_t protocol_ivars[] = {
{"class_pointer", &type_ClassPtr}, {"class_pointer", &type_Class},
{"protocol_name", &type_string}, {"protocol_name", &type_string},
{"protocol_list", &type_pointer}, {"protocol_list", &type_pointer},
{"instance_methods", &type_pointer}, {"instance_methods", &type_pointer},
@ -172,7 +172,7 @@ static struct_def_t protocol_ivars[] = {
}; };
static struct_def_t object_ivars[] = { static struct_def_t object_ivars[] = {
{"class_pointer", &type_ClassPtr}, {"class_pointer", &type_Class},
{0, 0} {0, 0}
}; };
@ -240,14 +240,14 @@ init_classes (void)
{ {
symbol_t *sym; symbol_t *sym;
type_Class.meta = ty_class; type_obj_class.meta = ty_class;
type_Class.t.class = &class_Class; type_obj_class.t.class = &class_Class;
chain_type (&type_obj_class);
chain_type (&type_Class); chain_type (&type_Class);
chain_type (&type_ClassPtr);
sym = make_structure (0, 's', class_ivars, 0); sym = make_structure (0, 's', class_ivars, 0);
class_Class.ivars = sym->type->t.symtab; class_Class.ivars = sym->type->t.symtab;
class_Class.type = &type_Class; class_Class.type = &type_obj_class;
class_Class.super_class = get_class (sym = new_symbol ("Object"), 1); class_Class.super_class = get_class (sym = new_symbol ("Object"), 1);
class_Class.methods = new_methodlist (); class_Class.methods = new_methodlist ();
symtab_addsymbol (pr.symtab, sym); symtab_addsymbol (pr.symtab, sym);
@ -259,8 +259,8 @@ init_classes (void)
class_Protocol.ivars = sym->type->t.symtab; class_Protocol.ivars = sym->type->t.symtab;
class_Protocol.type = &type_Protocol; class_Protocol.type = &type_Protocol;
type_object.t.class = &class_object; type_obj_object.t.class = &class_object;
chain_type (&type_object); chain_type (&type_obj_object);
sym = make_structure (0, 's', object_ivars, 0); sym = make_structure (0, 's', object_ivars, 0);
class_object.ivars = sym->type->t.symtab; class_object.ivars = sym->type->t.symtab;
class_object.type = &type_id; class_object.type = &type_id;
@ -310,7 +310,7 @@ class_symbol (class_type_t *class_type, int external)
break; break;
case ct_class: case ct_class:
name = va ("_OBJ_CLASS_%s", class_type->c.class->name); name = va ("_OBJ_CLASS_%s", class_type->c.class->name);
type = &type_Class; type = &type_obj_class;
break; break;
case ct_protocol: case ct_protocol:
return 0; // probably in error recovery return 0; // probably in error recovery
@ -362,7 +362,7 @@ set_self_type (class_t *class, method_t *method)
if (method->instance) if (method->instance)
method->params->type = pointer_type (class->type); method->params->type = pointer_type (class->type);
else else
method->params->type = &type_ClassPtr; method->params->type = &type_Class;
} }
static void static void
@ -522,7 +522,7 @@ begin_class (class_t *class)
defspace_t *space; defspace_t *space;
sym = make_symbol (va ("_OBJ_METACLASS_%s", class->name), sym = make_symbol (va ("_OBJ_METACLASS_%s", class->name),
&type_Class, pr.far_data, st_static); &type_obj_class, pr.far_data, st_static);
meta_def = sym->s.def; meta_def = sym->s.def;
meta_def->initialized = meta_def->constant = meta_def->nosave = 1; meta_def->initialized = meta_def->constant = meta_def->nosave = 1;
space = meta_def->space; space = meta_def->space;
@ -532,7 +532,7 @@ begin_class (class_t *class)
EMIT_STRING (space, meta->super_class, class->super_class->name); EMIT_STRING (space, meta->super_class, class->super_class->name);
EMIT_STRING (space, meta->name, class->name); EMIT_STRING (space, meta->name, class->name);
meta->info = _PR_CLS_META; meta->info = _PR_CLS_META;
meta->instance_size = type_size (&type_Class); meta->instance_size = type_size (&type_obj_class);
EMIT_DEF (space, meta->ivars, emit_ivars (class_Class.ivars, "Class")); EMIT_DEF (space, meta->ivars, emit_ivars (class_Class.ivars, "Class"));
current_class = &class->class_type; current_class = &class->class_type;
sym = class_symbol (current_class, 0); sym = class_symbol (current_class, 0);
@ -1032,7 +1032,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),
&type_ClassPtr, &type_Class,
pr.near_data, st_static); pr.near_data, st_static);
if (!sym->table) if (!sym->table)
symtab_addsymbol (pr.symtab, sym); symtab_addsymbol (pr.symtab, sym);

2
tools/qfcc/source/qc-lex.l
View file

@ -272,7 +272,7 @@ static keyword_t keywords[] = {
{"unsigned", TYPE, &type_integer, 0, PROG_VERSION, 0},//FIXME {"unsigned", TYPE, &type_integer, 0, PROG_VERSION, 0},//FIXME
{"function", TYPE, &type_function, 0, PROG_VERSION, 0}, {"function", TYPE, &type_function, 0, PROG_VERSION, 0},
{"id", TYPE, &type_id, 0, PROG_VERSION, 1}, {"id", TYPE, &type_id, 0, PROG_VERSION, 1},
{"Class", TYPE, &type_ClassPtr, 0, PROG_VERSION, 1},//FIXME {"Class", TYPE, &type_Class, 0, PROG_VERSION, 1},
// {"Protocol", TYPE, &type_Protocol, 0, PROG_VERSION, 0}, // {"Protocol", TYPE, &type_Protocol, 0, PROG_VERSION, 0},
{"Method", TYPE, &type_Method, 0, PROG_VERSION, 1}, {"Method", TYPE, &type_Method, 0, PROG_VERSION, 1},
{"Super", TYPE, &type_Super, 0, PROG_VERSION, 1}, {"Super", TYPE, &type_Super, 0, PROG_VERSION, 1},

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

@ -587,7 +587,7 @@ encode_type (dstring_t *encoding, type_t *type)
dasprintf (encoding, ":"); dasprintf (encoding, ":");
break; break;
} }
if (type == &type_ClassPtr) { if (type == &type_Class) {
dasprintf (encoding, "#"); dasprintf (encoding, "#");
break; break;
} }