marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aul: Warn if a function parameter shadows a local variable 

Yeah. Aul looks up function parameters before local variables when
trying to resolve an identifier. Usually this doesn't matter, but you'll
notice it if you have a local variable and a parameter with the same
name, because the variable should be initialized to nil yet you get the
value of the parameter.
alut-include-path
Nicolas Hake 2017-02-13 17:20:03 +01:00
parent 1595bf56a5
commit 1594acd3ed
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/script/C4AulCompiler.cpp
View File

@ -507,6 +507,15 @@ void C4AulCompiler::PreparseAstVisitor::visit(const ::aul::ast::VarDecl *n)
C4String *s = ::Strings.FindString(cname);
if (s && target_host->GetPropList()->HasProperty(s))
Warn(target_host, host, n, Fn, C4AulWarningId::variable_shadows_variable, cname, "local variable", "object-local variable");
if (Fn->ParNamed.GetItemNr(cname) != -1)
{
// The parameter order of this warning is correct:
// Aul looks up parameters before local variables, so
// the parameter actually shadows the local variable.
// This doesn't make a whole lot of sense and should
// probably be changed.
Warn(target_host, host, n, Fn, C4AulWarningId::variable_shadows_variable, cname, "parameter", "local variable");
}
}
Fn->VarNamed.AddName(cname);
break;
@ -1051,6 +1060,8 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::VarExpr *n)
// Why parameters are considered before function-scoped variables
// you ask? I've no idea, but that's how it was before I started
// changing things.
// NOTE: If you change this, remember to also change the warning
// (variable_shadows_variable) in PreparseAstVisitor.
if (Fn->ParNamed.GetItemNr(cname) != -1)
{
int pos = Fn->ParNamed.GetItemNr(cname);

5
tests/aul/AulTest.cpp
View File

@ -305,6 +305,11 @@ TEST_F(AulTest, Warnings)
EXPECT_CALL(errh, OnWarning(::testing::StartsWith("empty controlled statement"))).Times(0);
RunCode("if (true) {} else {}");
}
{
ErrorHandler errh;
EXPECT_CALL(errh, OnWarning(::testing::EndsWith("[variable_shadows_variable]")));
RunScript("func Main(f) { var f; }");
}
}
TEST_F(AulTest, NoWarnings)