darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-03-24 19:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix T...name

Browse source
This commit is contained in:
Dale Weiler 2014-07-31 12:37:26 -04:00
parent 4c1c1bc051
commit 823b053e60
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parser.c
View file

@ -4675,10 +4675,6 @@ static ast_value *parse_parameter_list(parser_t *parser, ast_value *var)
}
}
} else {
if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC && param->name[0] == '<') {
parseerror(parser, "parameter name omitted");
goto on_error;
}
vec_push(params, param);
if (param->expression.vtype >= TYPE_VARIANT) {
char tname[1024]; /* typename is reserved in C++ */
@ -4697,12 +4693,17 @@ static ast_value *parse_parameter_list(parser_t *parser, ast_value *var)
}
if (parser->tok == TOKEN_IDENT) {
argcounter = util_strdup(parser_tokval(parser));
ast_value_set_name(param, argcounter);
if (!parser_next(parser) || parser->tok != ')') {
parseerror(parser, "`...` must be the last parameter of a variadic function declaration");
goto on_error;
}
}
}
if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC && param->name[0] == '<') {
parseerror(parser, "parameter name omitted");
goto on_error;
}
}
}

2
tests/varargs.qc
View file

@ -1,4 +1,4 @@
void nbva(float a, ...count) {
void nbva(float a, string...count) {
print("You gave me ", ftos(count), " additional parameters\n");
print("First: ", ...(0, string), "\n");
print("You chose: ", ...(a, string), "\n");