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

factoring out the closing-paren handling code since it'll be used recursively

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-07-27 13:07:16 +02:00
parent 623046dda8
commit 6b85f3d370
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
parser.c
View file

@ -391,6 +391,27 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
return true; return true;
} }
static bool parser_close_paren(parser_t *parser, shunt *sy)
{
if (!sy->ops_count) {
parseerror(parser, "unmatched closing paren");
return false;
}
if (sy->ops[sy->ops_count-1].paren == 1) {
parseerror(parser, "empty parenthesis expression");
return false;
}
while (sy->ops_count) {
if (sy->ops[sy->ops_count-1].paren == 1) {
sy->ops_count--;
break;
}
if (!parser_sy_pop(parser, sy))
return false;
}
return true;
}
static ast_expression* parser_expression(parser_t *parser) static ast_expression* parser_expression(parser_t *parser)
{ {
ast_expression *expr = NULL; ast_expression *expr = NULL;
@ -461,22 +482,8 @@ static ast_expression* parser_expression(parser_t *parser)
else if (parser->tok == ')') { else if (parser->tok == ')') {
/* we do expect an operator next */ /* we do expect an operator next */
/* closing an opening paren */ /* closing an opening paren */
if (!sy.ops_count) { if (!parser_close_paren(parser, &sy))
parseerror(parser, "unmatched closing paren");
goto onerr; goto onerr;
}
if (sy.ops[sy.ops_count-1].paren == 1) {
parseerror(parser, "empty parenthesis expression");
goto onerr;
}
while (sy.ops_count) {
if (sy.ops[sy.ops_count-1].paren == 1) {
sy.ops_count--;
break;
}
if (!parser_sy_pop(parser, &sy))
goto onerr;
}
} }
else if (parser->tok != TOKEN_OPERATOR) { else if (parser->tok != TOKEN_OPERATOR) {
parseerror(parser, "expected operator or end of statement"); parseerror(parser, "expected operator or end of statement");