Nested functions will now be correctly handled (See Walters comments).

dlang · Jan 10, 2013 · 7a3a17e · 7a3a17e
1 parent 62dead4
commit 7a3a17e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/func.c b/src/func.c
@@ -1806,7 +1806,13 @@ int FuncDeclaration::equals(Object *o)
 void FuncDeclaration::bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
     if (fbody && (!hgs->hdrgen || global.params.useInline || hgs->autoMember || hgs->tpltMember))
-    {   buf->writenl();
+    {
+        int savetlpt = hgs->tpltMember;
+        int saveauto = hgs->autoMember;
+        hgs->tpltMember = 0;
+        hgs->autoMember = 0;
+
+        buf->writenl();
 
         // in{}
         if (frequire)
@@ -1842,6 +1848,9 @@ void FuncDeclaration::bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs)
         buf->level--;
         buf->writebyte('}');
         buf->writenl();
+
+        hgs->tpltMember = savetlpt;
+        hgs->autoMember = saveauto;
     }
     else
     {