Merge pull request #264 from kennytm/bug5587_unittestWithLine

Bug 5587: Give unit test name by __LINE__.
dlang · Sep 6, 2012 · d3669f7 · d3669f7
2 parents 6a8be06 + af9cd30
commit d3669f7
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/func.c b/src/func.c
@@ -3950,13 +3950,21 @@ void InvariantDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
  * instances per module.
  */
 
-static Identifier *unitTestId()
+#if __DMC__ || _MSC_VER
+#define snprintf _snprintf
+#endif
+static Identifier *unitTestId(Loc loc)
 {
-    return Lexer::uniqueId("__unittest");
+    char name[24];
+    snprintf(name, 24, "__unittestL%u_", loc.linnum);
+    return Lexer::uniqueId(name);
 }
+#if __DMC__ || _MSC_VER
+#undef snprintf
+#endif
 
 UnitTestDeclaration::UnitTestDeclaration(Loc loc, Loc endloc)
-    : FuncDeclaration(loc, endloc, unitTestId(), STCundefined, NULL)
+    : FuncDeclaration(loc, endloc, unitTestId(loc), STCundefined, NULL)
 {
 }