Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 6e300d9344402086f842815a9d92112caf82ac54)
+++ src/CodeGen/CodeGenerator.cc	(revision 29cf9c8380adc64d48f6b1c9ddf904a690e12b65)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 14:32:00 2017
-// Update Count     : 483
+// Last Modified On : Tus May  9 16:50:00 2017
+// Update Count     : 484
 //
 
@@ -42,5 +42,5 @@
 	int CodeGenerator::tabsize = 4;
 
-	// Pseudo Function: output << lineDirective(*currentNode);
+	// Pseudo Function: output << lineDirective(currentNode);
     struct lineDirective {
         CodeLocation const & loc;
@@ -143,4 +143,6 @@
 	// *** Declarations
 	void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+		output << lineDirective( functionDecl );
+
 		extension( functionDecl );
 		genAttributes( functionDecl->get_attributes() );
@@ -166,4 +168,6 @@
 		}
 
+		output << lineDirective( objectDecl );
+
 		extension( objectDecl );
 		genAttributes( objectDecl->get_attributes() );
@@ -195,5 +199,5 @@
 		}
 
-		output << lineDirective( aggDecl ) << kind;
+		output << kind;
 		if ( aggDecl->get_name() != "" )
 			output << aggDecl->get_name();
@@ -217,4 +221,6 @@
 
 	void CodeGenerator::visit( StructDecl * structDecl ) {
+		output << lineDirective( structDecl );
+
 		extension( structDecl );
 		handleAggregate( structDecl, "struct " );
@@ -222,4 +228,6 @@
 
 	void CodeGenerator::visit( UnionDecl * unionDecl ) {
+		output << lineDirective( unionDecl );
+
 		extension( unionDecl );
 		handleAggregate( unionDecl, "union " );