qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-14 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cexpr] Support varargs functions

Browse source 
While there may be better solutions, I needed a varargs function for
building Vulkan specialization data. Like progs functions, negative
parameter counts indicate ellipsis with the number of fixed parameters
being equal to -param_count - 1.
This commit is contained in:
Bill Currie 2021-12-01 14:39:28 +09:00
parent 422ad2a6c9
commit bd31f40c9b
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/util/cexpr-parse.y
View file

@ -363,7 +363,7 @@ static exprval_t *function_expr (exprsym_t *fsym, exprlist_t *list,
exprctx_t *context) exprctx_t *context)
{ {
exprlist_t *l; exprlist_t *l;
int num_args = 0; int num_args = 1;// one extra for terminating null
exprfunc_t *func = 0; exprfunc_t *func = 0;
exprval_t *result; exprval_t *result;
@ -371,6 +371,7 @@ static exprval_t *function_expr (exprsym_t *fsym, exprlist_t *list,
num_args++; num_args++;
} }
__auto_type args = (const exprval_t **) alloca (num_args * sizeof (exprval_t *)); __auto_type args = (const exprval_t **) alloca (num_args * sizeof (exprval_t *));
args[num_args - 1] = 0; // terminate array of args for varargs functions
__auto_type types = (exprtype_t **) alloca (num_args * sizeof (exprtype_t *)); __auto_type types = (exprtype_t **) alloca (num_args * sizeof (exprtype_t *));
for (num_args = 0; list; list = l, num_args++) { for (num_args = 0; list; list = l, num_args++) {
args[num_args] = list->value; args[num_args] = list->value;
@ -385,8 +386,15 @@ static exprval_t *function_expr (exprsym_t *fsym, exprlist_t *list,
return result; return result;
} }
for (exprfunc_t *f = fsym->value; f->result; f++) { for (exprfunc_t *f = fsym->value; f->result; f++) {
if (f->num_params == num_args int num_params = f->num_params;
&& memcmp (f->param_types, types, if (num_params >= 0 && num_args == num_params) {
} else if (num_params < 0 && num_args >= ~num_params) {
num_params = ~num_params;
} else {
continue;
}
if (!num_params
|| memcmp (f->param_types, types,
num_args * sizeof (exprtype_t *)) == 0) { num_args * sizeof (exprtype_t *)) == 0) {
func = f; func = f;
break; break;