if (!parser->function)
return nullptr;
fun = parser->function->function_type;
- for (auto &it : fun->expression.params) {
+ for (auto &it : fun->expression.type_params) {
if (!strcmp(it->name, name))
return (ast_expression*)it;
}
ast_ctx(fun).line);
}
- if (fun->params.size() != paramcount &&
+ if (fun->type_params.size() != paramcount &&
!((fun->flags & AST_FLAG_VARIADIC) &&
- fun->params.size() < paramcount))
+ fun->type_params.size() < paramcount))
{
- const char *fewmany = (fun->params.size() > paramcount) ? "few" : "many";
+ const char *fewmany = (fun->type_params.size() > paramcount) ? "few" : "many";
if (fval)
return !parsewarning(parser, WARN_INVALID_PARAMETER_COUNT,
"too %s parameters for call to %s: expected %i, got %i\n"
" -> `%s` has been declared here: %s:%i",
- fewmany, fval->name, (int)fun->params.size(), (int)paramcount,
+ fewmany, fval->name, (int)fun->type_params.size(), (int)paramcount,
fval->name, ast_ctx(fun).file, (int)ast_ctx(fun).line);
else
return !parsewarning(parser, WARN_INVALID_PARAMETER_COUNT,
"too %s parameters for function call: expected %i, got %i\n"
" -> it has been declared here: %s:%i",
- fewmany, (int)fun->params.size(), (int)paramcount,
+ fewmany, (int)fun->type_params.size(), (int)paramcount,
ast_ctx(fun).file, (int)ast_ctx(fun).line);
}
}
parser_enterblock(parser);
- for (auto &it : var->expression.params) {
+ for (auto &it : var->expression.type_params) {
size_t e;
ast_member *me[3];
goto enderrfn;
}
func->varargs = varargs;
- func->fixedparams = (ast_value*)parser->m_fold.constgen_float(var->expression.params.size(), false);
+ func->fixedparams = (ast_value*)parser->m_fold.constgen_float(var->expression.type_params.size(), false);
}
parser->function = func;
goto cleanup;
}
(void)!ast_value_set_name(value, "value"); /* not important */
- fval->expression.params.push_back(index);
- fval->expression.params.push_back(value);
+ fval->expression.type_params.push_back(index);
+ fval->expression.type_params.push_back(value);
array->setter = fval;
return fval;
{
ast_expression *root = nullptr;
root = array_setter_node(parser, array,
- array->setter->expression.params[0],
- array->setter->expression.params[1],
+ array->setter->expression.type_params[0],
+ array->setter->expression.type_params[1],
0, array->expression.count);
if (!root) {
parseerror(parser, "failed to build accessor search tree");
goto cleanup;
}
(void)!ast_value_set_name(value, "value"); /* not important */
- fval->expression.params.push_back(entity);
- fval->expression.params.push_back(index);
- fval->expression.params.push_back(value);
+ fval->expression.type_params.push_back(entity);
+ fval->expression.type_params.push_back(index);
+ fval->expression.type_params.push_back(value);
root = array_field_setter_node(parser, array, entity, index, value, 0, array->expression.count);
if (!root) {
parseerror(parser, "failed to create locals for array accessor");
goto cleanup;
}
- fval->expression.params.push_back(index);
+ fval->expression.type_params.push_back(index);
array->getter = fval;
return fval;
{
ast_expression *root = nullptr;
- root = array_getter_node(parser, array, array->getter->expression.params[0], 0, array->expression.count);
+ root = array_getter_node(parser, array, array->getter->expression.type_params[0], 0, array->expression.count);
if (!root) {
parseerror(parser, "failed to build accessor search tree");
return false;
fval->expression.flags |= AST_FLAG_VARIADIC;
var = fval;
- var->expression.params = params;
+ var->expression.type_params = params;
var->expression.varparam = (ast_expression*)varparam;
var->argcounter = argcounter;
goto cleanup;
}
/* we need the new parameter-names */
- for (i = 0; i < proto->expression.params.size(); ++i)
- ast_value_set_name(proto->expression.params[i], var->expression.params[i]->name);
+ for (i = 0; i < proto->expression.type_params.size(); ++i)
+ ast_value_set_name(proto->expression.type_params[i], var->expression.type_params[i]->name);
if (!parser_check_qualifiers(parser, var, proto)) {
retval = false;
if (proto->desc)
cov = func->function_type;
expr = (ast_expression*)cov;
- if (expr->vtype != TYPE_FUNCTION || expr->params.size()) {
+ if (expr->vtype != TYPE_FUNCTION || expr->type_params.size()) {
char ty[1024];
ast_type_to_string(expr, ty, sizeof(ty));
con_out("invalid type for coverage(): %s\n", ty);
*/
for (auto &f : parser->functions) {
if (f->varargs) {
- if (parser->max_param_count > f->function_type->expression.params.size()) {
- f->varargs->expression.count = parser->max_param_count - f->function_type->expression.params.size();
+ if (parser->max_param_count > f->function_type->expression.type_params.size()) {
+ f->varargs->expression.count = parser->max_param_count - f->function_type->expression.type_params.size();
if (!parser_create_array_setter_impl(parser, f->varargs)) {
con_out("failed to generate vararg setter for %s\n", f->name);
ir_builder_delete(ir);