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

distinguish between break/continue levels in the parser

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-12-27 23:52:57 +01:00
parent ebb7cb2ae3
commit c702970a0e
1 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
parser.c
View file

@ -62,7 +62,8 @@ typedef struct {
*/
ast_label **labels;
ast_goto **gotos;
const char **loops;
const char **breaks;
const char **continues;
/* A list of hashtables for each scope */
ht *variables;
@ -2054,19 +2055,22 @@ static bool parse_while(parser_t *parser, ast_block *block, ast_expression **out
return false;
}
vec_push(parser->loops, label);
vec_push(parser->breaks, label);
vec_push(parser->continues, label);
rv = parse_while_go(parser, block, out);
if (label)
mem_d(label);
if (vec_last(parser->loops) != label) {
if (vec_last(parser->breaks) != label || vec_last(parser->continues) != label) {
parseerror(parser, "internal error: label stack corrupted");
rv = false;
ast_delete(*out);
*out = NULL;
}
else
vec_pop(parser->loops);
else {
vec_pop(parser->breaks);
vec_pop(parser->continues);
}
return rv;
}
@ -2152,19 +2156,22 @@ static bool parse_dowhile(parser_t *parser, ast_block *block, ast_expression **o
}
}
vec_push(parser->loops, label);
vec_push(parser->breaks, label);
vec_push(parser->continues, label);
rv = parse_dowhile_go(parser, block, out);
if (label)
mem_d(label);
if (vec_last(parser->loops) != label) {
if (vec_last(parser->breaks) != label || vec_last(parser->continues) != label) {
parseerror(parser, "internal error: label stack corrupted");
rv = false;
ast_delete(*out);
*out = NULL;
}
else
vec_pop(parser->loops);
else {
vec_pop(parser->breaks);
vec_pop(parser->continues);
}
return rv;
}
@ -2274,19 +2281,22 @@ static bool parse_for(parser_t *parser, ast_block *block, ast_expression **out)
return false;
}
vec_push(parser->loops, label);
vec_push(parser->breaks, label);
vec_push(parser->continues, label);
rv = parse_for_go(parser, block, out);
if (label)
mem_d(label);
if (vec_last(parser->loops) != label) {
if (vec_last(parser->breaks) != label || vec_last(parser->continues) != label) {
parseerror(parser, "internal error: label stack corrupted");
rv = false;
ast_delete(*out);
*out = NULL;
}
else
vec_pop(parser->loops);
else {
vec_pop(parser->breaks);
vec_pop(parser->continues);
}
return rv;
}
static bool parse_for_go(parser_t *parser, ast_block *block, ast_expression **out)
@ -2449,9 +2459,10 @@ static bool parse_return(parser_t *parser, ast_block *block, ast_expression **ou
static bool parse_break_continue(parser_t *parser, ast_block *block, ast_expression **out, bool is_continue)
{
size_t i;
size_t i;
unsigned int levels = 0;
lex_ctx ctx = parser_ctx(parser);
lex_ctx ctx = parser_ctx(parser);
const char **loops = (is_continue ? parser->continues : parser->breaks);
(void)block; /* not touching */
if (!parser_next(parser)) {
@ -2462,9 +2473,9 @@ static bool parse_break_continue(parser_t *parser, ast_block *block, ast_express
if (parser->tok == TOKEN_IDENT) {
if (!OPTS_FLAG(LOOP_LABELS))
parseerror(parser, "labeled loops not activated, try using -floop-labels");
i = vec_size(parser->loops);
i = vec_size(loops);
while (i--) {
if (parser->loops[i] && !strcmp(parser->loops[i], parser_tokval(parser)))
if (loops[i] && !strcmp(loops[i], parser_tokval(parser)))
break;
if (!i) {
parseerror(parser, "no such loop to %s: `%s`",
@ -4985,6 +4996,8 @@ void parser_cleanup()
vec_free(parser->labels);
vec_free(parser->gotos);
vec_free(parser->breaks);
vec_free(parser->continues);
mem_d(parser);
}