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

the error about an already-declared variable should display the place its been previously declared at

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-14 13:50:55 +02:00
parent 5ef88dbda7
commit e35a26a9e1
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
parser.c
View file

@ -1387,6 +1387,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
lex_ctx ctx; lex_ctx ctx;
ast_value *var; ast_value *var;
varentry_t varent; varentry_t varent;
ast_expression *olddecl;
int basetype = parser_token(parser)->constval.t; int basetype = parser_token(parser)->constval.t;
@ -1410,15 +1411,17 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
return false; return false;
} }
if (!localblock && parser_find_global(parser, parser_tokval(parser))) { if (!localblock && (olddecl = parser_find_global(parser, parser_tokval(parser)))) {
ast_value_delete(var); ast_value_delete(var);
parseerror(parser, "global already exists: %s\n", parser_tokval(parser)); parseerror(parser, "global %s already declared here: %s:%i\n",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false; return false;
} }
if (localblock && parser_find_local(parser, parser_tokval(parser), parser->blocklocal)) { if (localblock && parser_find_local(parser, parser_tokval(parser), parser->blocklocal)) {
ast_value_delete(var); ast_value_delete(var);
parseerror(parser, "local variable already exists: %s\n", parser_tokval(parser)); parseerror(parser, "local %s already declared here: %s:%i\n",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false; return false;
} }