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

Minor cleanups to message_expr().

Browse source 
Fix for class names no longer being pointers to the class.
This commit is contained in:
Bill Currie 2011-02-04 23:22:51 +09:00
parent eff3957487
commit 1f6abb2cce
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/qfcc/source/expr.c
View file

@ -2415,6 +2415,7 @@ message_expr (expr_t *receiver, keywordarg_t *message)
keywordarg_t *m; keywordarg_t *m;
int self = 0, super = 0, class_msg = 0; int self = 0, super = 0, class_msg = 0;
type_t *rec_type; type_t *rec_type;
type_t *return_type;
class_t *class; class_t *class;
method_t *method; method_t *method;
@ -2440,21 +2441,24 @@ message_expr (expr_t *receiver, keywordarg_t *message)
if (receiver->type == ex_error) if (receiver->type == ex_error)
return receiver; return receiver;
if (rec_type->type != ev_pointer if (rec_type->type == ev_pointer)
|| !is_class (rec_type->t.fldptr.type)) rec_type = rec_type->t.fldptr.type;
if (!is_class (rec_type))
return error (receiver, "not a class/object"); return error (receiver, "not a class/object");
if (self) { if (self) {
class = extract_class (current_class); class = extract_class (current_class);
if (rec_type == &type_Class) if (rec_type == class_Class.type)
class_msg = 1; class_msg = 1;
} else { } else {
class = rec_type->t.fldptr.type->t.class; class = rec_type->t.class;
} }
} }
return_type = &type_id;
method = class_message_response (class, class_msg, selector); method = class_message_response (class, class_msg, selector);
if (method) if (method)
rec_type = method->type->t.func.type; return_type = method->type->t.func.type;
for (m = message; m; m = m->next) { for (m = message; m; m = m->next) {
*a = m->expr; *a = m->expr;
@ -2477,7 +2481,7 @@ message_expr (expr_t *receiver, keywordarg_t *message)
if (call->type == ex_error) if (call->type == ex_error)
return receiver; return receiver;
call->e.block.result = new_ret_expr (rec_type); call->e.block.result = new_ret_expr (return_type);
return call; return call;
} }