From b36bd3a988b5dc1423d1781113c397b9fb9bd6bd Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 11 Nov 2012 09:52:55 +0900 Subject: [PATCH] Remove the list offsets from the class ivars. Even just before, type_obj_object, type_obj_class and type_obj_protocol were a bit bogus (still are), but now the arrays used to list their ivars are correct. I plan to create the above mentioned types using class_to_struct to do it properly. --- tools/qfcc/source/class.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c index 4975b4fa7..a6e727e91 100644 --- a/tools/qfcc/source/class.c +++ b/tools/qfcc/source/class.c @@ -142,7 +142,6 @@ static struct_def_t module_struct[] = { }; static struct_def_t class_ivars[] = { - {"class_pointer", &type_Class}, {"super_class", &type_Class}, {"name", &type_string}, {"version", &type_integer}, @@ -159,7 +158,6 @@ static struct_def_t class_ivars[] = { }; static struct_def_t protocol_ivars[] = { - {"class_pointer", &type_Class}, {"protocol_name", &type_string}, {"protocol_list", &type_pointer}, {"instance_methods", &type_pointer}, @@ -1396,11 +1394,11 @@ init_classes (void) make_class ("Object", &type_obj_object, object_ivars, 0); chain_type (&type_id); - make_class ("Class", &type_obj_class, class_ivars + 1, + make_class ("Class", &type_obj_class, class_ivars, type_obj_object.t.class); chain_type (&type_Class); - make_class ("Protocol", &type_obj_protocol, protocol_ivars + 1, + make_class ("Protocol", &type_obj_protocol, protocol_ivars, type_obj_object.t.class); }