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

pr_obj.c:

Browse source 
delay class fixups so order doesn't matter
class.c:
	write out the class and category diffs properly
This commit is contained in:
Bill Currie 2002-08-16 22:53:37 +00:00
parent e1f6830067
commit c1c6c05cf5
2 changed files with 52 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
libs/gamecode/engine/pr_obj.c
View file

@ -92,6 +92,28 @@ object_get_class_name (progs_t *pr, pr_id_t *object)
//====================================================================
static void
finish_class (progs_t *pr, pr_class_t *class, pointer_t object_ptr)
{
pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
pr_class_t *val;
meta->class_pointer = object_ptr;
if (class->super_class) {
val = Hash_Find (pr->classes, PR_GetString (pr,
class->super_class));
meta->super_class = val->class_pointer;
class->super_class = POINTER_TO_PROG (pr, val);
} else {
pointer_t *ml = &meta->methods;
while (*ml)
ml = &G_STRUCT (pr, pr_method_list_t, *ml).method_next;
*ml = class->methods;
}
Sys_DPrintf (" %d %d %d\n", meta->class_pointer, meta->super_class,
class->super_class);
}
static void
pr___obj_exec_class (progs_t *pr)
{
@ -100,8 +122,6 @@ pr___obj_exec_class (progs_t *pr)
pointer_t *ptr;
int i;
//int d = developer->int_val;
pr_class_t *object_class;
pointer_t object_ptr;
if (!module)
return;
@ -147,42 +167,6 @@ pr___obj_exec_class (progs_t *pr)
Sys_DPrintf (" protocols: %d\n", category->protocols);
ptr++;
}
object_class = Hash_Find (pr->classes, "Object");
if (object_class && !object_class->super_class)
object_ptr = (pr_type_t *)object_class - pr->pr_globals;
else
PR_Error (pr, "root class Object not found");
ptr = symtab->defs;
for (i = 0; i < symtab->cls_def_cnt; i++) {
pr_class_t *class = &G_STRUCT (pr, pr_class_t, *ptr);
pr_class_t *meta = &G_STRUCT (pr, pr_class_t, class->class_pointer);
pr_class_t *val;
meta->class_pointer = object_ptr;
if (class->super_class) {
val = Hash_Find (pr->classes, PR_GetString (pr,
class->super_class));
meta->super_class = val->class_pointer;
class->super_class = POINTER_TO_PROG (pr, val);
} else {
pointer_t *ml = &meta->methods;
while (*ml)
ml = &G_STRUCT (pr, pr_method_list_t, *ml).method_next;
*ml = class->methods;
}
Sys_DPrintf (" %d %d %d\n", meta->class_pointer, meta->super_class,
class->super_class);
ptr++;
}
for (i = 0; i < symtab->cat_def_cnt; i++) {
//pr_category_t *category = &G_STRUCT (pr, pr_category_t, *ptr);
ptr++;
}
//developer->int_val = d;
}
//====================================================================
@ -909,6 +893,7 @@ void
PR_InitRuntime (progs_t *pr)
{
int fnum;
pr_class_t **class_list, **class;;
if (!pr->classes)
pr->classes = Hash_NewTable (1021, class_get_key, 0, pr);
@ -921,4 +906,19 @@ PR_InitRuntime (progs_t *pr)
PR_ExecuteProgram (pr, fnum);
}
}
class_list = (pr_class_t **) Hash_GetList (pr->classes);
if (*class_list) {
pr_class_t *object_class;
pointer_t object_ptr;
object_class = Hash_Find (pr->classes, "Object");
if (object_class && !object_class->super_class)
object_ptr = (pr_type_t *)object_class - pr->pr_globals;
else
PR_Error (pr, "root class Object not found");
for (class = class_list; *class; class++)
finish_class (pr, *class, object_ptr);
}
free (class_list);
}

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

@ -480,18 +480,22 @@ class_finish_module (void)
symtab->cls_def_cnt = num_classes;
symtab->cat_def_cnt = num_categories;
def_ptr = symtab->defs;
for (i = 0, t = classes; i < num_classes; i++, t++) {
if (classes) {
for (t = classes; *t; t++) {
if ((*t)->def && !(*t)->def->external) {
reloc_def_def ((*t)->def, POINTER_OFS (def_ptr));
*def_ptr++ = (*t)->def->ofs;
}
}
for (i = 0, t = categories; i < num_categories; i++, t++) {
}
if (categories) {
for (t = categories; *t; t++) {
if ((*t)->def && !(*t)->def->external) {
reloc_def_def ((*t)->def, POINTER_OFS (def_ptr));
*def_ptr++ = (*t)->def->ofs;
}
}
}
module_def = get_def (type_module, "_OBJ_MODULE", pr.scope, st_static);
module_def->initialized = module_def->constant = 1;