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

Prohibit overriding local vars with functions (#1831) 

The old parser threw a standard compile error in this case; the
AST-based parser threw an ICE, which is ultimately the same thing but
made it sound like the parser was at fault. And maybe it is, and we
should allow code like "local a; func a() {}" but that seems like it
should be a conscious design decision.
directional-lights
Nicolas Hake 2016-10-21 22:28:10 +02:00
parent 8d2f2846b5
commit cada67c097
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/C4AulCompiler.cpp
View File

@ -1551,7 +1551,9 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::VarDecl *n)
void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::FunctionDecl *n)
{
C4PropListStatic *Parent = n->is_global ? target_host->Engine->GetPropList() : target_host->GetPropList();
C4AulFunc *f = Parent->GetFunc(n->name.c_str());
C4String *name = ::Strings.FindString(n->name.c_str());
C4AulFunc *f = Parent->GetFunc(name);
while (f)
{
if (f->SFunc() && f->SFunc()->pOrgScript == host && f->Parent == Parent)
@ -1563,6 +1565,11 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::FunctionDecl *n)
f = f->SFunc() ? f->SFunc()->OwnerOverloaded : 0;
}
if (!Fn && Parent->HasProperty(name))
{
throw Error(target_host, host, n, Fn, "declaration of '%s': cannot override local variable via 'func %s'", n->name.c_str(), n->name.c_str());
}
assert(Fn && "CodegenAstVisitor: unable to find function definition");
if (!Fn)
throw Error(target_host, host, n, Fn, "internal error: unable to find function definition for %s", n->name.c_str());