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

make class_def return a correct def

Browse source
This commit is contained in:
Bill Currie 2002-05-16 22:33:11 +00:00
parent 4908b3cf10
commit 7cdbef2b11
4 changed files with 57 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,7 @@ void class_add_methods (class_t *class, struct methodlist_s *methods);
void class_add_protocol_methods (class_t *class, expr_t *protocols);
void class_add_protocol (class_t *class, struct protocol_s *protocol);
void class_check_ivars (class_t *class, struct type_s *ivars);
void class_begin (class_t *class);
void class_finish (class_t *class);
struct method_s *class_find_method (class_t *class, struct method_s *method);
struct method_s *class_message_response (class_t *class, struct expr_s *sel);

1
tools/qfcc/include/expr.h
View file

@ -131,6 +131,7 @@ expr_t *new_unary_expr (int op, expr_t *e1);
expr_t *new_temp_def_expr (type_t *type);
expr_t *new_bind_expr (expr_t *e1, expr_t *e2);
expr_t *new_name_expr (const char *name);
expr_t *new_def_expr (def_t *def);
void inc_users (expr_t *e);
void convert_name (expr_t *e);

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

@ -38,6 +38,7 @@ static const char rcsid[] =
#include "qfcc.h"
#include "class.h"
#include "expr.h"
#include "method.h"
#include "struct.h"
#include "type.h"
@ -125,13 +126,12 @@ class_add_protocol (class_t *class, protocol_t *protocol)
}
void
class_finish (class_t *class)
class_begin (class_t *class)
{
if (class->def)
return;
if (class->class_name && class->category_name) {
def_t *category_def;
pr_category_t *category;
category_def = PR_GetDef (type_category,
va ("_OBJ_CATEGORY_%s_%s",
@ -139,7 +139,6 @@ class_finish (class_t *class)
class->category_name),
0, &numpr_globals);
category_def->initialized = category_def->constant = 1;
category = &G_STRUCT (pr_category_t, category_def->ofs);
} else if (class->class_name) {
def_t *meta_def;
pr_class_t *meta;
@ -155,7 +154,6 @@ class_finish (class_t *class)
meta->name = meta->class_pointer;
meta->instance_size = type_size (type_Class.aux_type);
meta->ivars = emit_struct (type_Class.aux_type, "Class");
meta->methods = emit_methods (class->methods, class->class_name, 0);
meta->protocols = emit_protocol_list (class->protocols,
class->class_name);
@ -168,10 +166,30 @@ class_finish (class_t *class)
if (class->super_class)
cls->super_class = class->super_class->def->ofs;
cls->name = meta->name;
cls->protocols = meta->protocols;
}
}
void
class_finish (class_t *class)
{
if (class->class_name && class->category_name) {
pr_category_t *category;
category = &G_STRUCT (pr_category_t, class->def->ofs);
} else if (class->class_name) {
pr_class_t *meta;
pr_class_t *cls;
cls = &G_STRUCT (pr_class_t, class->def->ofs);
meta = &G_STRUCT (pr_class_t, cls->class_pointer);
meta->methods = emit_methods (class->methods, class->class_name, 0);
cls->instance_size = type_size (class->ivars);
cls->ivars = emit_struct (class->ivars, class->class_name);
cls->methods = emit_methods (class->methods, class->class_name, 1);
cls->protocols = meta->protocols;
}
}
@ -272,7 +290,14 @@ get_category (const char *class_name, const char *category_name, int create)
def_t *
class_def (class_t *class)
{
return PR_GetDef (class->type, class->class_name, 0, &numpr_globals);
def_t *def;
def = PR_GetDef (class->type,
va ("_OBJ_CLASS_POINTER_%s", class->class_name),
0, &numpr_globals);
def->initialized = def->constant = 1;
G_INT (def->ofs) = class->def->ofs;
return def;
}
protocol_t *

48
tools/qfcc/source/qc-parse.y
View file

@ -979,34 +979,34 @@ protocol_name
classdef
: INTERFACE new_class_name
protocolrefs { class_add_protocol_methods ($2, $3); }
'{' ivar_decl_list '}' { $2->ivars = $6; }
methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; }
protocolrefs { class_add_protocol_methods ($2, $3);}
'{' ivar_decl_list '}' { $2->ivars = $6; }
methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; }
| INTERFACE new_class_name
protocolrefs { class_add_protocol_methods ($2, $3); }
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
| INTERFACE new_class_with_super
protocolrefs { class_add_protocol_methods ($2, $3); }
'{' ivar_decl_list '}' { $2->ivars = $6; }
methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; }
protocolrefs { class_add_protocol_methods ($2, $3);}
'{' ivar_decl_list '}' { $2->ivars = $6; }
methodprotolist { class_add_methods ($2, $9); }
END { current_class = 0; }
| INTERFACE new_class_with_super
protocolrefs { class_add_protocol_methods ($2, $3); }
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
| INTERFACE new_category_name
protocolrefs { class_add_protocol_methods ($2, $3); }
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
| IMPLEMENTATION class_name
'{' ivar_decl_list '}' { class_check_ivars ($2, $4); }
| IMPLEMENTATION class_name
| IMPLEMENTATION class_with_super
'{' ivar_decl_list '}' { class_check_ivars ($2, $4); }
| IMPLEMENTATION class_with_super
| IMPLEMENTATION category_name
protocolrefs { class_add_protocol_methods ($2, $3);}
methodprotolist { class_add_methods ($2, $5); }
END { current_class = 0; }
| IMPLEMENTATION class_name { class_begin ($2); }
'{' ivar_decl_list '}' { class_check_ivars ($2, $5); }
| IMPLEMENTATION class_name { class_begin ($2); }
| IMPLEMENTATION class_with_super { class_begin ($2); }
'{' ivar_decl_list '}' { class_check_ivars ($2, $5); }
| IMPLEMENTATION class_with_super { class_begin ($2); }
| IMPLEMENTATION category_name { class_begin ($2); }
;
protocoldef