darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 02:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

parsing array initializers

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-06-12 14:17:33 +02:00
parent d631c517b6
commit 7a36a8bdd8
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ast.h
View file

@ -180,11 +180,6 @@ struct ast_value_s
const char *argcounter;
/*
int vtype;
ast_value *next;
*/
int cvq; /* const/var qualifier */
bool isfield; /* this declares a field */
bool isimm; /* an immediate, not just const */

45
parser.c
View file

@ -5192,6 +5192,43 @@ static bool parser_check_qualifiers(parser_t *parser, const ast_value *var, cons
return true;
}
static bool parse_array(parser_t *parser, ast_value *array)
{
if (!parser_next(parser)) {
parseerror(parser, "parse error in array initializer");
return false;
}
while (parser->tok != '}') {
ast_value *v = (ast_value*)parse_expression_leave(parser, true, false, false);
if (!v)
return false;
if (!ast_istype(v, ast_value) || !v->hasvalue || v->cvq != CV_CONST) {
ast_unref(v);
parseerror(parser, "initializing element must be a compile time constant");
return false;
}
vec_push(array->initlist, v->constval);
ast_unref(v);
if (parser->tok == '}')
break;
if (parser->tok != ',' || !parser_next(parser)) {
parseerror(parser, "expected comma or '}' in element list");
return false;
}
}
if (!parser_next(parser) || parser->tok != ';') {
parseerror(parser, "expected semicolon after initializer, got %s");
return false;
}
/*
if (!parser_next(parser)) {
parseerror(parser, "parse error after initializer");
return false;
}
*/
return true;
}
static bool parse_variable(parser_t *parser, ast_block *localblock, bool nofields, int qualifier, ast_value *cached_typedef, bool noref, bool is_static, uint32_t qflags, char *vstring)
{
ast_value *var;
@ -5803,11 +5840,9 @@ skipvar:
parseerror(parser, "TODO: initializers for local arrays");
break;
}
/*
static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma, bool truthvalue, bool with_labels);
*/
parseerror(parser, "TODO: initializing global arrays is not supported yet!");
break;
if (!parse_array(parser, var))
break;
}
else if (var->expression.vtype == TYPE_FUNCTION && (parser->tok == '{' || parser->tok == '['))
{