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

fixed a bug which allowed some statements to end in tokens other than semicolons... (ie closing parens)

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-10 15:23:04 +01:00
parent 428453a132
commit 81cc4194dc
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parser.c
View file

@ -1957,7 +1957,7 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma
goto onerr; goto onerr;
} }
if (parser->tok == ';' || if (parser->tok == ';' ||
(!parens && parser->tok == ']')) (!parens && (parser->tok == ']' || parser->tok == ')')))
{ {
break; break;
} }
@ -1996,8 +1996,13 @@ static ast_expression* parse_expression(parser_t *parser, bool stopatcomma, bool
ast_expression *e = parse_expression_leave(parser, stopatcomma, false, with_labels); ast_expression *e = parse_expression_leave(parser, stopatcomma, false, with_labels);
if (!e) if (!e)
return NULL; return NULL;
if (parser->tok != ';') {
parseerror(parser, "semicolon expected after expression");
ast_unref(e);
return NULL;
}
if (!parser_next(parser)) { if (!parser_next(parser)) {
ast_delete(e); ast_unref(e);
return NULL; return NULL;
} }
return e; return e;