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

better message type checking

Browse source
This commit is contained in:
Bill Currie 2003-08-22 05:26:47 +00:00
parent febc57e71b
commit 204243fe95
3 changed files with 57 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/method.h
View file

@ -89,4 +89,6 @@ struct def_s *emit_methods (methodlist_t *methods, const char *name,
void clear_selectors (void);
struct expr_s *method_check_params (method_t *method, struct expr_s *args);
#endif//__method_h

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

@ -2599,17 +2599,8 @@ message_expr (expr_t *receiver, keywordarg_t *message)
*a = receiver;
if (method) {
def_t def;
expr_t e, *err;
def.type = method->type;
def.name = method->name;
e.type = ex_def;
e.e.def = &def;
e.line = receiver->line;
e.file = receiver->file;
err = function_expr (&e, args);
if (err->type == ex_error)
expr_t *err;
if ((err = method_check_params (method, args)))
return err;
}
call = function_expr (send_message (super), args);

53
tools/qfcc/source/method.c
View file

@ -55,6 +55,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "emit.h"
#include "immediate.h"
#include "method.h"
#include "options.h"
#include "reloc.h"
#include "strpool.h"
#include "struct.h"
@ -383,3 +384,55 @@ clear_selectors (void)
if (known_methods)
Hash_FlushTable (known_methods);
}
expr_t *
method_check_params (method_t *method, expr_t *args)
{
int i, count, parm_count;
expr_t *a, **arg_list, *err = 0;
type_t *mtype = method->type;
if (mtype->num_parms == -1)
return 0;
for (count = 0, a = args; a; a = a->next)
count++;
if (count > MAX_PARMS)
return error (args, "more than %d parameters", MAX_PARMS);
if (mtype->num_parms >= 0)
parm_count = mtype->num_parms;
else
parm_count = -mtype->num_parms - 1;
if (count < parm_count)
return error (args, "too few arguments");
if (mtype->num_parms >= 0 && count > mtype->num_parms)
return error (args, "too many arguments");
arg_list = malloc (count * sizeof (expr_t *));
for (i = count - 1, a = args; a; a = a->next)
arg_list[i--] = a;
for (i = 2; i < count; i++) {
expr_t *e = arg_list[i];
type_t *t = get_type (e);
if (mtype->parm_types[i] == &type_float && e->type == ex_integer) {
convert_int (e);
t = &type_float;
}
if (i < parm_count) {
if (e->type != ex_nil)
if (!type_assignable (mtype->parm_types[i], t)) {
err = error (e, "type mismatch for parameter %d of %s",
i - 1, method->name);
}
} else {
if (e->type == ex_integer && options.warnings.vararg_integer)
warning (e, "passing integer consant into ... function");
}
}
free (arg_list);
return err;
}