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

Aul: Always reset the current function when a declaration ends (#1839) 

When an error occurred during codegen of a function, the current
function pointer would not be reset to 0, leading to spurious warnings
about redeclaration of functions.
directional-lights
Nicolas Hake 2016-11-03 11:02:31 +01:00
parent 072e1dcde0
commit ff0325dfac
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/script/C4AulCompiler.cpp
View File

@ -500,9 +500,16 @@ void C4AulCompiler::PreparseAstVisitor::visit(const ::aul::ast::FunctionDecl *n)
Fn->SetOverloaded(parent_func);
Parent->SetPropertyByS(Fn->Name, C4VFunction(Fn));
try
{
DefaultRecursiveVisitor::visit(n);
Fn = nullptr;
Fn = nullptr;
}
catch (...)
{
Fn = nullptr;
throw;
}
}
void C4AulCompiler::PreparseAstVisitor::visit(const ::aul::ast::CallExpr *n)
@ -1551,6 +1558,10 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::VarDecl *n)
void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::FunctionDecl *n)
{
assert(!Fn && "CodegenAstVisitor: function declaration encountered within active function");
if (Fn)
throw Error(target_host, host, n, Fn, "internal error: function declaration for '%s' encountered within active function", n->name.c_str());
C4PropListStatic *Parent = n->is_global ? target_host->Engine->GetPropList() : target_host->GetPropList();
C4String *name = ::Strings.FindString(n->name.c_str());
@ -1585,9 +1596,16 @@ void C4AulCompiler::CodegenAstVisitor::visit(const ::aul::ast::FunctionDecl *n)
Fn->SetOverloaded(global_parent);
}
try
{
EmitFunctionCode(n);
Fn = nullptr;
Fn = nullptr;
}
catch (...)
{
Fn = nullptr;
throw;
}
}
void C4AulCompiler::CodegenAstVisitor::visit(const::aul::ast::FunctionExpr * n)