Index: src/CodeGen/CodeGenerator.cc
===================================================================
--- src/CodeGen/CodeGenerator.cc	(revision 4e8949f3e86a781045a82d44c0fd4e0469048937)
+++ src/CodeGen/CodeGenerator.cc	(revision a9a4771331631e1338a1d5ab0d850ac26e893f6e)
@@ -89,10 +89,10 @@
 		} else if ( currentLocation.followedBy( to, 1 ) ) {
 			output << "\n" << indent;
-			currentLocation.linenumber += 1;
+			currentLocation.first_line += 1;
 		} else if ( currentLocation.followedBy( to, 2 ) ) {
 			output << "\n\n" << indent;
-			currentLocation.linenumber += 2;
-		} else {
-			output << "\n# " << to.linenumber << " \"" << to.filename
+			currentLocation.first_line += 2;
+		} else {
+			output << "\n# " << to.first_line << " \"" << to.filename
 			       << "\"\n" << indent;
 			currentLocation = to;