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

moving 'return' parsing into a function

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-19 19:22:00 +01:00
parent 6e888396b5
commit 2d8bf20d43
1 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
parser.c
View file

@ -1678,6 +1678,46 @@ onerr:
return false; return false;
} }
static bool parse_return(parser_t *parser, ast_block *block, ast_expression **out)
{
ast_expression *exp = NULL;
ast_return *ret = NULL;
ast_value *expected = parser->function->vtype;
if (!parser_next(parser)) {
parseerror(parser, "expected return expression");
return false;
}
if (parser->tok != ';') {
exp = parse_expression(parser, false);
if (!exp)
return false;
if (exp->expression.vtype != expected->expression.next->expression.vtype) {
parseerror(parser, "return with invalid expression");
}
ret = ast_return_new(exp->expression.node.context, exp);
if (!ret) {
ast_delete(exp);
return false;
}
} else {
if (!parser_next(parser))
parseerror(parser, "parse error");
if (expected->expression.next->expression.vtype != TYPE_VOID) {
if (opts_standard != COMPILER_GMQCC)
(void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
else
parseerror(parser, "return without value");
}
ret = ast_return_new(parser_ctx(parser), NULL);
}
*out = (ast_expression*)ret;
return true;
}
static bool parse_statement(parser_t *parser, ast_block *block, ast_expression **out) static bool parse_statement(parser_t *parser, ast_block *block, ast_expression **out)
{ {
if (parser->tok == TOKEN_TYPENAME || parser->tok == '.') if (parser->tok == TOKEN_TYPENAME || parser->tok == '.')
@ -1715,42 +1755,7 @@ static bool parse_statement(parser_t *parser, ast_block *block, ast_expression *
} }
else if (!strcmp(parser_tokval(parser), "return")) else if (!strcmp(parser_tokval(parser), "return"))
{ {
ast_expression *exp = NULL; return parse_return(parser, block, out);
ast_return *ret = NULL;
ast_value *expected = parser->function->vtype;
if (!parser_next(parser)) {
parseerror(parser, "expected return expression");
return false;
}
if (parser->tok != ';') {
exp = parse_expression(parser, false);
if (!exp)
return false;
if (exp->expression.vtype != expected->expression.next->expression.vtype) {
parseerror(parser, "return with invalid expression");
}
ret = ast_return_new(exp->expression.node.context, exp);
if (!ret) {
ast_delete(exp);
return false;
}
} else {
if (!parser_next(parser))
parseerror(parser, "parse error");
if (expected->expression.next->expression.vtype != TYPE_VOID) {
if (opts_standard != COMPILER_GMQCC)
(void)!parsewarning(parser, WARN_MISSING_RETURN_VALUES, "return without value");
else
parseerror(parser, "return without value");
}
ret = ast_return_new(parser_ctx(parser), NULL);
}
*out = (ast_expression*)ret;
return true;
} }
else if (!strcmp(parser_tokval(parser), "if")) else if (!strcmp(parser_tokval(parser), "if"))
{ {