Merge pull request #4823 from thk123/fix-scientific-printing

Don't add trailing dot if printing in scientific exponent

Author: Thomas Kiley

jbmc/src/java_bytecode/expr2java.h

@@ -75,8 +75,13 @@ std::string floating_point_to_java_string(float_type value)
     std::ostringstream raw_stream;
     raw_stream << value;
     const auto raw_decimal = raw_stream.str();
-    if(raw_decimal.find('.') == std::string::npos)
+    const bool is_scientific = raw_decimal.find('e') != std::string::npos;
+    if(
+      raw_decimal.find('.') == std::string::npos &&
+      !is_scientific) // don't add trailing .0 if in scientific notation
+    {
       return raw_decimal + ".0";
+    }
     return raw_decimal;
   }();
   const bool is_lossless = [&] {

jbmc/unit/java_bytecode/expr2java.cpp

@@ -129,4 +129,10 @@ TEST_CASE(
     REQUIRE(floating_point_to_java_string(-5.56268e-309) == "-5.56268e-309");
 #endif
   }
+
+  SECTION("Precise exponent")
+  {
+    REQUIRE(floating_point_to_java_string(3e+06) == "3e+06");
+    REQUIRE(floating_point_to_java_string(3e+06f) == "3e+06f");
+  }
 }