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

Local variable parsing

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-07-20 12:46:59 +02:00
parent 5ffa0dda8e
commit 3decabaa8f
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
parser.c
View file

@ -91,7 +91,7 @@ typedef struct {
} paramlist_t; } paramlist_t;
MEM_VEC_FUNCTIONS(paramlist_t, ast_value*, p) MEM_VEC_FUNCTIONS(paramlist_t, ast_value*, p)
ast_value *parser_parse_type(parser_t *parser, bool *isfunc) static ast_value *parser_parse_type(parser_t *parser, bool *isfunc)
{ {
paramlist_t params; paramlist_t params;
ast_value *var; ast_value *var;
@ -156,11 +156,15 @@ ast_value *parser_parse_type(parser_t *parser, bool *isfunc)
return var; return var;
} }
bool parser_body_do(parser_t *parser, ast_block *block) static bool parser_variable(parser_t *parser, bool global);
static bool parser_body_do(parser_t *parser, ast_block *block)
{ {
if (parser->tok == TOKEN_TYPENAME) if (parser->tok == TOKEN_TYPENAME)
{ {
/* local variable */ /* local variable */
if (!parser_variable(parser, false))
return false;
return true;
} }
else if (parser->tok == '{') else if (parser->tok == '{')
{ {
@ -171,7 +175,7 @@ bool parser_body_do(parser_t *parser, ast_block *block)
return false; return false;
} }
ast_block* parser_parse_block(parser_t *parser) static ast_block* parser_parse_block(parser_t *parser)
{ {
size_t oldblocklocal; size_t oldblocklocal;
ast_block *block = NULL; ast_block *block = NULL;
@ -198,12 +202,19 @@ ast_block* parser_parse_block(parser_t *parser)
} }
} }
if (parser->tok != '}') {
ast_block_delete(block);
block = NULL;
} else {
(void)parser_next(parser);
}
cleanup: cleanup:
parser->blocklocal = oldblocklocal; parser->blocklocal = oldblocklocal;
return block; return block;
} }
bool parser_variable(parser_t *parser, bool global) static bool parser_variable(parser_t *parser, bool global)
{ {
bool isfunc = false; bool isfunc = false;
ast_function *func = NULL; ast_function *func = NULL;
@ -352,7 +363,7 @@ bool parser_variable(parser_t *parser, bool global)
return true; return true;
} }
bool parser_do(parser_t *parser) static bool parser_do(parser_t *parser)
{ {
if (parser->tok == TOKEN_TYPENAME) if (parser->tok == TOKEN_TYPENAME)
{ {