darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-03-22 02:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Starting some typechecking. Function parameters must be part of ast_expression_common, they're part of the type, not ast_value...

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-07-27 15:07:25 +02:00
parent 65f4f03aa5
commit 6379d39bb7
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
parser.c
View file

@ -441,6 +441,7 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
ast_call *call;
size_t fid;
size_t paramcount;
sy->ops_count--;
fid = sy->ops[sy->ops_count].off;
@ -469,18 +470,21 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
if (fid+1 == sy->out_count) {
/* no arguments */
paramcount = 0;
} else if (fid+2 == sy->out_count) {
ast_block *params;
sy->out_count--;
params = sy->out[sy->out_count].block;
if (!params) {
/* 1 param */
paramcount = 1;
if (!ast_call_params_add(call, sy->out[sy->out_count].out)) {
ast_delete(sy->out[sy->out_count].out);
parseerror(parser, "out of memory");
return false;
}
} else {
paramcount = params->exprs_count;
MEM_VECTOR_MOVE(params, exprs, call, params);
ast_delete(params);
}
@ -491,6 +495,25 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
/* overwrite fid, the function, with a call */
sy->out[fid] = syexp(call->expression.node.context, (ast_expression*)call);
if (fun->expression.vtype != TYPE_FUNCTION) {
parseerror(parser, "not a function");
return false;
}
if (!fun->expression.next) {
parseerror(parser, "could not determine function parameters");
return false;
} else {
/*
ast_value *v = (ast_value*)(fun->expression.next);
if (v->params_count != paramcount) {
parseerror(parser, "expected %i parameters, got %i", (int)v->params_count, paramcount);
return false;
}
*/
}
return true;
}