Merge upstream commits and resolve conflicts

CONTRIBUTING.md

@@ -1,3 +1,5 @@
+[![Issue Stats](http://issuestats.com/github/nlohmann/json/badge/pr?style=flat)](http://issuestats.com/github/nlohmann/json) [![Issue Stats](http://issuestats.com/github/nlohmann/json/badge/issue?style=flat)](http://issuestats.com/github/nlohmann/json)
+
 # How to contribute
 
 This project started as a little excuse to exercise some of the cool new C++11 features. Over time, people actually started to use the JSON library (yey!) and started to help improve it by proposing features, finding bugs, or even fixing my mistakes. I am really [thankful](https://github.com/nlohmann/json/blob/master/README.md#thanks) for this and try to keep track of all the helpers.
@@ -72,4 +74,5 @@ The following areas really need contribution:
 - Extending the **continuous integration** beyond Linux running some versions of GCC and Clang on [Travis](https://travis-ci.org/nlohmann/json) and Microsoft Visual Studio on [AppVeyor](https://ci.appveyor.com/project/nlohmann/json). We have found a lot of bugs just because several compilers behave in a slightly different manner.
 - Improving the efficiency of the **JSON parser**. The current parser is implemented as a naive recursive descent parser with hand coded string handling. More sophisticated approaches like LALR parsers would be really appreciated. That said, parser generators like Bison or ANTLR do not play nice with single-header files -- I really would like to keep the parser inside the `json.hpp` header, and I am not aware of approaches similar to [`re2c`](http://re2c.org) for parsing.
 - Extending and updating existing **benchmarks** to include (the most recent version of) this library. Though efficiency is not everything, speed and memory consumption are very important characteristics for C++ developers, so having proper comparisons would be interesting.
-- Check the code with [Coverity](https://scan.coverity.com).
+- Check the code with [**Coverity**](https://scan.coverity.com).
+- Make the code **locale-independent**. The library currently only works for a locale where `.` is the decimal point character.

README.md

@@ -25,6 +25,8 @@ Other aspects were not so important to us:
 
 - **Speed**. We currently implement the parser as naive [recursive descent parser](http://en.wikipedia.org/wiki/Recursive_descent_parser) with hand coded string handling. It is fast enough, but a [LALR-parser](http://en.wikipedia.org/wiki/LALR_parser) with a decent regular expression processor should be even faster (but would consist of more files which makes the integration harder).
 
+See the [https://github.com/nlohmann/json/blob/master/CONTRIBUTING.md#please-dont](contribution guidelines) for more information.
+
 ## Integration
 
 The single required source, file `json.hpp` is in the `src` directory or [released here](https://github.com/nlohmann/json/releases). All you need to do is add

src/json.hpp

@@ -5873,10 +5873,16 @@ class basic_json
 
             case value_t::number_float:
             {
-                // 15 digits of precision allows round-trip IEEE 754
+                // If the number is an integer then output as a fixed with with precision 1
-                // string->double->string; to be safe, we read this value from
+                // to output "0.0", "1.0" etc as expected for some round trip tests otherwise
-                // std::numeric_limits<number_float_t>::digits10
+                // 15 digits of precision allows round-trip IEEE 754 string->double->string; 
-                o << std::setprecision(std::numeric_limits<number_float_t>::digits10) << m_value.number_float;
+                // to be safe, we read this value from std::numeric_limits<number_float_t>::digits10
+                if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1);
+                else {
+                    o.unsetf(std::ios_base::floatfield);  // std::defaultfloat not supported in gcc version < 5
+                    o << std::setprecision(std::numeric_limits<double>::digits10);
+                }
+                o << m_value.number_float;
                 return;
             }
 

src/json.hpp.re2c

@@ -5873,10 +5873,16 @@ class basic_json
 
             case value_t::number_float:
             {
-                // 15 digits of precision allows round-trip IEEE 754
+                // If the number is an integer then output as a fixed with with precision 1
-                // string->double->string; to be safe, we read this value from
+                // to output "0.0", "1.0" etc as expected for some round trip tests otherwise
-                // std::numeric_limits<number_float_t>::digits10
+                // 15 digits of precision allows round-trip IEEE 754 string->double->string; 
-                o << std::setprecision(std::numeric_limits<number_float_t>::digits10) << m_value.number_float;
+                // to be safe, we read this value from std::numeric_limits<number_float_t>::digits10
+                if (std::fmod(m_value.number_float, 1) == 0) o << std::fixed << std::setprecision(1);
+                else {
+                    o.unsetf(std::ios_base::floatfield);  // std::defaultfloat not supported in gcc version < 5
+                    o << std::setprecision(std::numeric_limits<double>::digits10);
+                }
+                o << m_value.number_float;
                 return;
             }
 

test/unit.cpp

@@ -11751,15 +11751,15 @@ TEST_CASE("compliance tests from nativejson-benchmark")
                     "test/json_roundtrip/roundtrip10.json",
                     "test/json_roundtrip/roundtrip11.json",
                     "test/json_roundtrip/roundtrip12.json",
-                    //"test/json_roundtrip/roundtrip13.json",
+                    "test/json_roundtrip/roundtrip13.json",
                     "test/json_roundtrip/roundtrip14.json",
                     "test/json_roundtrip/roundtrip15.json",
                     "test/json_roundtrip/roundtrip16.json",
                     "test/json_roundtrip/roundtrip17.json",
-                    //"test/json_roundtrip/roundtrip18.json",
+                    "test/json_roundtrip/roundtrip18.json",
-                    //"test/json_roundtrip/roundtrip19.json",
+                    "test/json_roundtrip/roundtrip19.json",
-                    //"test/json_roundtrip/roundtrip20.json",
+                    "test/json_roundtrip/roundtrip20.json",
-                    //"test/json_roundtrip/roundtrip21.json",
+                    "test/json_roundtrip/roundtrip21.json",
                     "test/json_roundtrip/roundtrip22.json",
                     "test/json_roundtrip/roundtrip23.json",
                     //"test/json_roundtrip/roundtrip24.json",
@@ -12263,6 +12263,8 @@ TEST_CASE("regression tests")
         j = json::parse("0.999999999999999944488848768742172978818416595458984374");
         CHECK(j.get<double>() == 0.99999999999999989);
 
+        // Test fails under GCC/clang due to strtod() error (may originate in libstdc++
+        // but seems to have been fixed in the most current versions - just not on Travis)
 #if !defined(__clang__) && !defined(__GNUC__) && !defined(__GNUG__)
         j = json::parse("1.00000000000000011102230246251565404236316680908203126");
         CHECK(j.get<double>() == 1.00000000000000022);