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

-Wlocal-shadows - note that -std=gmqcc is very different from the rest

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-18 21:54:19 +02:00
parent deccf4e708
commit ee3aaa58b3
2 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
parser.c
View file

@ -1792,6 +1792,7 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
olddecl = NULL;
isfunc = false;
func = NULL;
isparam = false;
ctx = parser_ctx(parser);
var = parser_parse_type(parser, basetype, &isfunc);
@ -1811,11 +1812,52 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
return false;
}
if (localblock && (olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal, &isparam))) {
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false;
if (localblock) {
olddecl = parser_find_local(parser, parser_tokval(parser), parser->blocklocal, &isparam);
if (opts_standard == COMPILER_GMQCC)
{
if (olddecl)
{
if (!isparam) {
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false;
}
}
if( (!isparam && olddecl) || (olddecl = parser_find_local(parser, parser_tokval(parser), 0, &isparam)) )
{
if (parsewarning(parser, WARN_LOCAL_SHADOWS,
"local `%s` is shadowing a parameter", parser_tokval(parser)))
{
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false;
}
}
}
else
{
if (olddecl)
{
if (isparam &&
parsewarning(parser, WARN_LOCAL_SHADOWS,
"a parameter is shadowing local `%s`", parser_tokval(parser)))
{
ast_value_delete(var);
return false;
}
else if (!isparam)
{
ast_value_delete(var);
parseerror(parser, "local `%s` already declared here: %s:%i",
parser_tokval(parser), ast_ctx(olddecl).file, (int)ast_ctx(olddecl).line);
return false;
}
}
}
}
}

1
warns.def
View file

@ -9,3 +9,4 @@ GMQCC_DEFINE_FLAG(EXTENSIONS)
GMQCC_DEFINE_FLAG(FIELD_REDECLARED)
GMQCC_DEFINE_FLAG(MISSING_RETURN_VALUES)
GMQCC_DEFINE_FLAG(TOO_FEW_PARAMETERS)
GMQCC_DEFINE_FLAG(LOCAL_SHADOWS)