D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-20 14:53:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed problem with nested function inside static nested function. see mini/compile_nested2.d. fixes #143 .

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-12-09 14:57:01 +01:00
parent 3c400ff21c
commit 99396c2e7a
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gen/functions.cpp
View File

@@ -771,24 +771,31 @@ void DtoDefineFunc(FuncDeclaration* fd)
if (!fd->nestedVars.empty())
{
Logger::println("has nested frame");
// start with add all enclosing parent frames
// start with adding all enclosing parent frames until a static parent is reached
int nparelems = 0;
Dsymbol* par = fd->toParent2();
while (par)
if (!fd->isStatic())
{
if (FuncDeclaration* parfd = par->isFuncDeclaration())
Dsymbol* par = fd->toParent2();
while (par)
{
nparelems += parfd->nestedVars.size();
if (FuncDeclaration* parfd = par->isFuncDeclaration())
{
nparelems += parfd->nestedVars.size();
// stop at first static
if (parfd->isStatic())
break;
}
else if (ClassDeclaration* parcd = par->isClassDeclaration())
{
// nothing needed
}
else
{
break;
}
par = par->toParent2();
}
else if (ClassDeclaration* parcd = par->isClassDeclaration())
{
// nothing needed
}
else
{
break;
}
par = par->toParent2();
}
int nelems = fd->nestedVars.size() + nparelems;

13
tests/mini/compile_nested2.d Normal file
View File

@@ -0,0 +1,13 @@
void test(void delegate() spam)
{
static void foo() // static is the problem
{
uint x;
void peek() { x = 0; }
}
void bar()
{
spam();
}
}