Merge pull request #2682 from calumgrant/cs/format-trap-floats

hvitved · web-flow · commit cfbdf21d1bc1 · 2020-01-24T09:13:18.000+01:00
C#: Fix outputting floats to the trap file
diff --git a/csharp/extractor/Semmle.Extraction/TrapExtensions.cs b/csharp/extractor/Semmle.Extraction/TrapExtensions.cs
@@ -162,7 +162,7 @@ public static void WriteTrapString(this TextWriter trapFile, string s)
 
         public static void WriteTrapFloat(this TextWriter trapFile, float f)
         {
-            trapFile.Write(f.ToString("0.#####e0"));  // Trap importer won't accept ints
+            trapFile.Write(f.ToString("F5", System.Globalization.CultureInfo.InvariantCulture));  // Trap importer won't accept ints
         }
 
         public static void WriteTuple(this TextWriter trapFile, string name, params object[] @params)

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public static void WriteTrapString(this TextWriter trapFile, string s)`
`162`	`162`
`163`	`163`	`public static void WriteTrapFloat(this TextWriter trapFile, float f)`
`164`	`164`	`{`
`165`		`- trapFile.Write(f.ToString("0.#####e0")); // Trap importer won't accept ints`
	`165`	`+ trapFile.Write(f.ToString("F5", System.Globalization.CultureInfo.InvariantCulture)); // Trap importer won't accept ints`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`public static void WriteTuple(this TextWriter trapFile, string name, params object[] @params)`