darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-24 04:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

parse_block gets a warn-return bool flag

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-19 20:20:39 +02:00
parent 14210a62ef
commit 66ec592f94
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
parser.c
View file

@ -46,8 +46,8 @@ MEM_VEC_FUNCTIONS(parser_t, ast_function*, functions)
static void parser_pop_local(parser_t *parser); static void parser_pop_local(parser_t *parser);
static bool parser_variable(parser_t *parser, ast_block *localblock); static bool parser_variable(parser_t *parser, ast_block *localblock);
static ast_block* parser_parse_block(parser_t *parser); static ast_block* parser_parse_block(parser_t *parser, bool warnreturn);
static bool parser_parse_block_into(parser_t *parser, ast_block *block); static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn);
static ast_expression* parser_parse_statement_or_block(parser_t *parser); static ast_expression* parser_parse_statement_or_block(parser_t *parser);
static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomma); static ast_expression* parser_expression_leave(parser_t *parser, bool stopatcomma);
static ast_expression* parser_expression(parser_t *parser, bool stopatcomma); static ast_expression* parser_expression(parser_t *parser, bool stopatcomma);
@ -1692,7 +1692,7 @@ static bool parser_parse_statement(parser_t *parser, ast_block *block, ast_expre
else if (parser->tok == '{') else if (parser->tok == '{')
{ {
ast_block *inner; ast_block *inner;
inner = parser_parse_block(parser); inner = parser_parse_block(parser, false);
if (!inner) if (!inner)
return false; return false;
*out = (ast_expression*)inner; *out = (ast_expression*)inner;
@ -1714,7 +1714,7 @@ static void parser_pop_local(parser_t *parser)
mem_d(parser->locals[parser->locals_count].name); mem_d(parser->locals[parser->locals_count].name);
} }
static bool parser_parse_block_into(parser_t *parser, ast_block *block) static bool parser_parse_block_into(parser_t *parser, ast_block *block, bool warnreturn)
{ {
size_t oldblocklocal; size_t oldblocklocal;
@ -1759,13 +1759,13 @@ cleanup:
return !!block; return !!block;
} }
static ast_block* parser_parse_block(parser_t *parser) static ast_block* parser_parse_block(parser_t *parser, bool warnreturn)
{ {
ast_block *block; ast_block *block;
block = ast_block_new(parser_ctx(parser)); block = ast_block_new(parser_ctx(parser));
if (!block) if (!block)
return NULL; return NULL;
if (!parser_parse_block_into(parser, block)) { if (!parser_parse_block_into(parser, block, warnreturn)) {
ast_block_delete(block); ast_block_delete(block);
return NULL; return NULL;
} }
@ -1776,7 +1776,7 @@ static ast_expression* parser_parse_statement_or_block(parser_t *parser)
{ {
ast_expression *expr = NULL; ast_expression *expr = NULL;
if (parser->tok == '{') if (parser->tok == '{')
return (ast_expression*)parser_parse_block(parser); return (ast_expression*)parser_parse_block(parser, false);
if (!parser_parse_statement(parser, NULL, &expr)) if (!parser_parse_statement(parser, NULL, &expr))
return NULL; return NULL;
return expr; return expr;
@ -2348,7 +2348,7 @@ nextvar:
} }
parser->function = func; parser->function = func;
if (!parser_parse_block_into(parser, block)) { if (!parser_parse_block_into(parser, block, true)) {
ast_block_delete(block); ast_block_delete(block);
parser->function = old; parser->function = old;
return false; return false;