Fixed bug that would cause immutables inside template function implem…

…entions to lose their initializers.
dlang · Dec 22, 2011 · bb539fe · bb539fe
1 parent b62e855
commit bb539fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/attrib.c b/src/attrib.c
@@ -548,7 +548,7 @@ void StorageClassDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
 	if(stc & STCimmutable) hgs->inImmutable++;	//HACK inform down-tree symbols they are immutable.
 
-    stcToCBuffer(buf, stc);
+	stcToCBuffer(buf, stc);
 	AttribDeclaration::toCBuffer(buf, hgs);
 
 	if(stc & STCimmutable) hgs->inImmutable--;	//Undo the hack.

diff --git a/src/declaration.c b/src/declaration.c
@@ -1583,8 +1583,8 @@ void VarDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 	}
     else
         buf->writestring(ident->toChars());	
-    
-	if(isConst() || hgs->inImmutable || hgs->hdrgen != 1)
+
+	if(isConst() || hgs->inImmutable || storage_class & STCimmutable || hgs->hdrgen != 1)
 	{
 		if (init)
 		{   buf->writestring(" = ");

diff --git a/src/func.c b/src/func.c
@@ -1670,6 +1670,7 @@ void FuncDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 	}
 	else
 		bodyToCBuffer(buf, hgs);
+	buf->writenl();
 }
 
 VarDeclaration *FuncDeclaration::declareThis(Scope *sc, AggregateDeclaration *ad)