Fixed number presision issues

artyom-beilis · artyom-beilis · commit 0d8db9a0187e · 2010-06-30T09:50:51.000Z
diff --git a/src/json.cpp b/src/json.cpp
@@ -24,6 +24,8 @@
 #include <algorithm>
 #include <iostream>
 #include <locale>
+#include <limits>
+#include <iomanip>
 #include <stdexcept>
 #include <stack>
 #include "utf_iterator.h"
@@ -324,7 +326,7 @@ namespace json {
 			out<<"null";
 			break;
 		case json::is_number:
-			out<<number();
+			out<<std::setprecision(std::numeric_limits<double>::digits10+1)<<number();
 			break;
 		case json::is_string:
 			out<<escape(str());
diff --git a/tests/json_test.cpp b/tests/json_test.cpp
@@ -19,6 +19,8 @@
 #include <cppcms/json.h>
 #include "test.h"
 #include <iostream>
+#include <limits>
+#include <stdlib.h>
 #include <sstream>
 #include <iomanip>
 using namespace cppcms;
@@ -153,6 +155,21 @@ int main()
 		v["y"][2]=json::array();
 		TEST(format(v)=="{\"x\":10,\"y\":[null,\"test\",[]]}");
 
+		std::string fl="123456789123456789123456789123456789";
+		fl = fl.substr(0,std::numeric_limits<double>::digits10);
+		double big_int=atof(fl.c_str());
+		TEST(format(big_int)==fl);
+		TEST(format(1277880000)=="1277880000");
+		TEST(format(-1277880000)=="-1277880000");
+		TEST(atoi(format(std::numeric_limits<int>::max()).c_str()) == std::numeric_limits<int>::max());
+		TEST(atoi(format(std::numeric_limits<int>::min()).c_str()) == std::numeric_limits<int>::min());
+		std::string fl2=fl.substr(0,1)+'.'+fl.substr(1);
+		big_int=atof(fl2.c_str());
+		TEST(format(big_int)==fl2);
+		TEST(format(-big_int)=="-" + fl2);
+		TEST(format(1.35e30)=="1.35e+30");
+		TEST(format(big_int * 1e30) == fl2+"e+30");
+
 	}
 	catch(std::exception const &e)
 	{
