darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-27 22:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handling of multiple variables with comma

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-07-20 12:53:42 +02:00
parent 3decabaa8f
commit 2763578f8b
1 changed files with 158 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
parser.c
View file

@ -91,20 +91,18 @@ typedef struct {
} paramlist_t; } paramlist_t;
MEM_VEC_FUNCTIONS(paramlist_t, ast_value*, p) MEM_VEC_FUNCTIONS(paramlist_t, ast_value*, p)
static ast_value *parser_parse_type(parser_t *parser, bool *isfunc) static ast_value *parser_parse_type(parser_t *parser, int basetype, bool *isfunc)
{ {
paramlist_t params; paramlist_t params;
ast_value *var; ast_value *var;
lex_ctx ctx = parser_ctx(parser); lex_ctx ctx = parser_ctx(parser);
int vtype = parser_token(parser)->constval.t; int vtype = basetype;
int temptype;
MEM_VECTOR_INIT(&params, p); MEM_VECTOR_INIT(&params, p);
*isfunc = false; *isfunc = false;
if (!parser_next(parser))
return NULL;
if (parser->tok == '(') { if (parser->tok == '(') {
*isfunc = true; *isfunc = true;
while (true) { while (true) {
@ -119,7 +117,12 @@ static ast_value *parser_parse_type(parser_t *parser, bool *isfunc)
if (parser->tok == ')') if (parser->tok == ')')
break; break;
param = parser_parse_type(parser, &dummy); temptype = parser_token(parser)->constval.t;
if (!parser_next(parser)) {
MEM_VECTOR_CLEAR(&params, p);
return NULL;
}
param = parser_parse_type(parser, temptype, &dummy);
(void)dummy; (void)dummy;
if (!param) { if (!param) {
@ -218,8 +221,23 @@ static bool parser_variable(parser_t *parser, bool global)
{ {
bool isfunc = false; bool isfunc = false;
ast_function *func = NULL; ast_function *func = NULL;
lex_ctx ctx = parser_ctx(parser); lex_ctx ctx;
ast_value *var = parser_parse_type(parser, &isfunc); ast_value *var;
int basetype = parser_token(parser)->constval.t;
while (true)
{
if (!parser_next(parser)) { /* skip basetype or comma */
parseerror(parser, "expected variable declaration");
return false;
}
isfunc = false;
func = NULL;
ctx = parser_ctx(parser);
var = parser_parse_type(parser, basetype, &isfunc);
if (!var) if (!var)
return false; return false;
@ -293,6 +311,11 @@ static bool parser_variable(parser_t *parser, bool global)
return true; return true;
} }
if (parser->tok == ',') {
/* another var */
continue;
}
if (parser->tok != '=') { if (parser->tok != '=') {
parseerror(parser, "expected '=' or ';'"); parseerror(parser, "expected '=' or ';'");
return false; return false;
@ -353,6 +376,11 @@ static bool parser_variable(parser_t *parser, bool global)
if (!parser_next(parser)) if (!parser_next(parser))
return false; return false;
if (parser->tok == ',') {
/* another */
continue;
}
if (parser->tok != ';') { if (parser->tok != ';') {
parseerror(parser, "expected semicolon"); parseerror(parser, "expected semicolon");
return false; return false;
@ -361,6 +389,7 @@ static bool parser_variable(parser_t *parser, bool global)
(void)parser_next(parser); (void)parser_next(parser);
return true; return true;
}
} }
static bool parser_do(parser_t *parser) static bool parser_do(parser_t *parser)