From 7724d34741a6e373e175750a235ea8cba5c955c2 Mon Sep 17 00:00:00 2001
From: Niels <niels.lohmann@gmail.com>
Date: Sun, 18 Jan 2015 10:58:48 +0100
Subject: [PATCH] fixed #31: only use spaces in pretty print

---
 README.md          | 4 +---
 header_only/json.h | 9 +++++----
 src/json.cc        | 9 +++++----
 test/json_unit.cc  | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 293b17bd..508a05a0 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ You can also get a string representation (serialize):
 
 ```cpp
 // explicit conversion to string
-std::string s = j.dump();    // {\"happy\": true, \"pi\": 3.141}
+std::string s = j.dump();    // {\"happy\":true,\"pi\":3.141}
 
 // serialization with pretty printing
 std::cout << j.dump(4) << std::endl;
@@ -142,8 +142,6 @@ std::cout << j.dump(4) << std::endl;
 // }
 ```
 
-The value of s could be `{"pi": 3.141, "happy": true}`, but the order of the entries in the object is not fixed.
-
 You can also use streams to serialize and deserialize:
 
 ```cpp
diff --git a/header_only/json.h b/header_only/json.h
index 78a36820..857e9376 100644
--- a/header_only/json.h
+++ b/header_only/json.h
@@ -982,7 +982,7 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
             {
                 if (i != value_.array->begin())
                 {
-                    result += prettyPrint ? ",\n" : ", ";
+                    result += prettyPrint ? ",\n" : ",";
                 }
                 result += indent() + i->dump(prettyPrint, indentStep, currentIndent);
             }
@@ -1017,10 +1017,11 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
             {
                 if (i != value_.object->begin())
                 {
-                    result += prettyPrint ? ",\n" : ", ";
+                    result += prettyPrint ? ",\n" : ",";
                 }
-                result += indent() + "\"" + i->first + "\": " + i->second.dump(prettyPrint, indentStep,
-                          currentIndent);
+                result += indent() + "\"" + i->first + "\":" + (prettyPrint ? " " : "") + i->second.dump(
+                              prettyPrint, indentStep,
+                              currentIndent);
             }
 
             // decrease indentation
diff --git a/src/json.cc b/src/json.cc
index 8370a735..30c37877 100644
--- a/src/json.cc
+++ b/src/json.cc
@@ -530,7 +530,7 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
             {
                 if (i != value_.array->begin())
                 {
-                    result += prettyPrint ? ",\n" : ", ";
+                    result += prettyPrint ? ",\n" : ",";
                 }
                 result += indent() + i->dump(prettyPrint, indentStep, currentIndent);
             }
@@ -565,10 +565,11 @@ std::string json::dump(const bool prettyPrint, const unsigned int indentStep,
             {
                 if (i != value_.object->begin())
                 {
-                    result += prettyPrint ? ",\n" : ", ";
+                    result += prettyPrint ? ",\n" : ",";
                 }
-                result += indent() + "\"" + i->first + "\": " + i->second.dump(prettyPrint, indentStep,
-                          currentIndent);
+                result += indent() + "\"" + i->first + "\":" + (prettyPrint ? " " : "") + i->second.dump(
+                              prettyPrint, indentStep,
+                              currentIndent);
             }
 
             // decrease indentation
diff --git a/test/json_unit.cc b/test/json_unit.cc
index c011e005..fb3abbeb 100644
--- a/test/json_unit.cc
+++ b/test/json_unit.cc
@@ -1921,8 +1921,8 @@ TEST_CASE("Parser")
     {
         auto j23 = "{ \"a\": null, \"b\": true, \"c\": [1,2,3], \"d\": {\"a\": 0} }"_json;
 
-        CHECK(j23.dump() == "{\"a\": null, \"b\": true, \"c\": [1, 2, 3], \"d\": {\"a\": 0}}");
-        CHECK(j23.dump(-1) == "{\"a\": null, \"b\": true, \"c\": [1, 2, 3], \"d\": {\"a\": 0}}");
+        CHECK(j23.dump() == "{\"a\":null,\"b\":true,\"c\":[1,2,3],\"d\":{\"a\":0}}");
+        CHECK(j23.dump(-1) == "{\"a\":null,\"b\":true,\"c\":[1,2,3],\"d\":{\"a\":0}}");
         CHECK(j23.dump(0) ==
               "{\n\"a\": null,\n\"b\": true,\n\"c\": [\n1,\n2,\n3\n],\n\"d\": {\n\"a\": 0\n}\n}");
         CHECK(j23.dump(4) ==