encode_json indenting::indent -> encode_json_pretty

Author: danielaparker

README.md

@@ -312,7 +312,7 @@ int main()
 
     // Encode the c++ structure into a string
     std::string s;
-    encode_json(v, s, indenting::indent);
+    encode_json_pretty(v, s);
     std::cout << "(2)\n";
     std::cout << s << "\n";
 }

doc/Examples.md

@@ -565,7 +565,7 @@ std::string s;
 
 j.dump(s); // compressed
 
-j.dump(s, indenting::indent); // pretty print
+j.dump_pretty(s); // pretty print
 ```
 
 <div id="B5"/>
@@ -605,7 +605,7 @@ j.dump(json_string);
 ```
 j.dump(std::cout); // compressed
 
-j.dump(std::cout, indenting::indent); // pretty print
+j.dump_pretty(std::cout); // pretty print
 ```
 or
 ```
@@ -1237,7 +1237,7 @@ int main()
                   << item.price << "\n";
     }
     std::cout << "\n";
-    encode_json(books1, std::cout, indenting::indent);
+    encode_json_pretty(books1, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(2)\n\n";
@@ -1250,7 +1250,7 @@ int main()
                   << item.get_price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books2, std::cout, indenting::indent);
+    encode_json_pretty(books2, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(3)\n\n";
@@ -1263,7 +1263,7 @@ int main()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books3, std::cout, indenting::indent);
+    encode_json_pretty(books3, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(4)\n\n";
@@ -1276,7 +1276,7 @@ int main()
                   << item.get_price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books4, std::cout, indenting::indent);
+    encode_json_pretty(books4, std::cout);
     std::cout << "\n\n";
 }
 ```
@@ -1450,7 +1450,7 @@ int main()
                   << item.price << "\n";
     }
     std::cout << "\n";
-    encode_json(books1, std::cout, indenting::indent);
+    encode_json_pretty(books1, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(2)\n\n";
@@ -1463,7 +1463,7 @@ int main()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books2, std::cout, indenting::indent);
+    encode_json_pretty(books2, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(3)\n\n";
@@ -1476,7 +1476,7 @@ int main()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books3, std::cout, indenting::indent);
+    encode_json_pretty(books3, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(4)\n\n";
@@ -1489,7 +1489,7 @@ int main()
                   << item.getPrice() << "\n";
     }
     std::cout << "\n";
-    encode_json(books4, std::cout, indenting::indent);
+    encode_json_pretty(books4, std::cout);
     std::cout << "\n\n";
 }
 ```
@@ -1698,7 +1698,7 @@ int main()
     }
 
     std::cout << "\n(2)\n";
-    encode_json(book_list, std::cout, indenting::indent);
+    encode_json_pretty(book_list, std::cout);
     std::cout << "\n\n";
 }
 ```
@@ -1802,8 +1802,8 @@ int main()
     std::string output1;
     std::string output2;
 
-    encode_json(val2, output2, indenting::indent);
-    encode_json(val1, output1, indenting::indent);
+    encode_json_pretty(val2, output2);
+    encode_json_pretty(val1, output1);
 
     std::cout << "(1)\n";
     std::cout << output1 << "\n\n";
@@ -2054,7 +2054,7 @@ int main()
 
     // Encode the c++ structure into a string
     std::string s;
-    encode_json(v, s, indenting::indent);
+    encode_json_pretty(v, s);
     std::cout << "(2)\n";
     std::cout << s << "\n";
 }

doc/Pages/index.md

@@ -240,7 +240,7 @@ int main()
 
     // Encode the c++ structure into a string
     std::string s;
-    encode_json(v, s, indenting::indent);
+    encode_json_pretty(v, s);
     std::cout << "(2)\n";
     std::cout << s << "\n";
 }

doc/ref/corelib/encode_json.md

@@ -183,7 +183,7 @@ int main()
 
     std::cout << "(2) Again, with pretty print\n" << '\n'; 
 
-    encode_json(employees, std::cout, indenting::indent);
+    encode_json_pretty(employees, std::cout);
 }
 ```
 Output:

doc/ref/corelib/json_type_traits/built-in-specializations.md

@@ -402,7 +402,7 @@ int main()
     };
 
     std::string json_data;
-    encode_json(results, json_data, indenting::indent);
+    encode_json_pretty(results, json_data);
     std::cout << json_data << "\n\n";
     auto results1 = decode_json<std::vector<qualifying_results_type>>(json_data);
     assert(results1 == results);

doc/ref/corelib/json_type_traits/custom-specializations.md

@@ -194,7 +194,7 @@ int main()
     }
 
     std::cout << "\n(2)\n";
-    encode_json(book_list, std::cout, indenting::indent);
+    encode_json_pretty(book_list, std::cout);
     std::cout << "\n\n";
 }
 ```

doc/ref/corelib/reflect/reflect-traits-gen.md

@@ -383,7 +383,7 @@ int main()
     }
 
     std::cout << "\n(2)\n";
-    encode_json(book_list, std::cout, indenting::indent);
+    encode_json_pretty(book_list, std::cout);
     std::cout << "\n\n";
 }
 ```
@@ -509,7 +509,7 @@ int main()
 
     // Encode the c++ structure into a string
     std::string s;
-    encode_json(v, s, indenting::indent);
+    encode_json_pretty(v, s);
     std::cout << "(2)\n";
     std::cout << s << "\n";
 }
@@ -1676,7 +1676,7 @@ int main()
     std::cout << "\n";
 
     std::string output;
-    encode_json(company, output, indenting::indent);
+    encode_json_pretty(company, output);
     std::cout << "(2)\n" << output << "\n\n";
 }
 ```
@@ -1780,7 +1780,7 @@ int main()
     std::cout << "\n";
 
     std::string output;
-    jsoncons::encode_json(persons, output, indenting::indent);
+    jsoncons::encode_json_pretty(persons, output);
     std::cout << "(2)\n" << output << "\n";
 }
 ```

examples/src/common/sample_types.hpp

@@ -52,6 +52,8 @@ namespace ns {
     class Person
     {
     public:
+        Person() : age(0) {}
+
         Person(const std::string& name, const std::string& surname,
                const std::string& ssn, unsigned int age)
            : name(name), surname(surname), ssn(ssn), age(age) { }
@@ -67,8 +69,6 @@ namespace ns {
         // Make json_type_traits specializations friends to give accesses to private members
         JSONCONS_TYPE_TRAITS_FRIEND
 
-        Person() : age(0) {}
-
         std::string name;
         std::string surname;
         std::string ssn;
@@ -121,7 +121,12 @@ namespace ns {
     {
         std::string application_;
         std::vector<hiking_reputon> reputons_;
+
+        // Make json_type_traits specializations friends to give accesses to private members
+        JSONCONS_TYPE_TRAITS_FRIEND
     public:
+        hiking_reputation() = default;
+
         hiking_reputation(const std::string& application, 
                           const std::vector<hiking_reputon>& reputons)
             : application_(application), 
@@ -176,9 +181,9 @@ namespace jsoncons {
         static ns::book as(const Json& j)
         {
             ns::book val;
-            val.author = j.at("author").as<std::string>();
-            val.title = j.at("title").as<std::string>();
-            val.price = j.at("price").as<double>();
+            val.author = j.at("author").template as<std::string>();
+            val.title = j.at("title").template as<std::string>();
+            val.price = j.at("price").template as<double>();
             return val;
         }
         static Json to_json(const ns::book& val, 

examples/src/json_traits_macros_examples.cpp

@@ -330,8 +330,8 @@ void json_type_traits_optional_examples()
     std::string output1;
     std::string output2;
 
-    encode_json(val2, output2, indenting::indent);
-    encode_json(val1, output1, indenting::indent);
+    encode_json_pretty(val2, output2);
+    encode_json_pretty(val1, output1);
 
     std::cout << "(1)\n";
     std::cout << output1 << "\n\n";
@@ -400,7 +400,7 @@ void json_type_traits_book_examples()
                   << item.price << "\n";
     }
     std::cout << "\n";
-    encode_json(books1, std::cout, indenting::indent);
+    encode_json_pretty(books1, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(2)\n\n";
@@ -413,7 +413,7 @@ void json_type_traits_book_examples()
                   << item.get_price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books2, std::cout, indenting::indent);
+    encode_json_pretty(books2, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(3)\n\n";
@@ -426,7 +426,7 @@ void json_type_traits_book_examples()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books3, std::cout, indenting::indent);
+    encode_json_pretty(books3, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(4)\n\n";
@@ -439,7 +439,7 @@ void json_type_traits_book_examples()
                   << item.get_price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books4, std::cout, indenting::indent);
+    encode_json_pretty(books4, std::cout);
     std::cout << "\n\n";
 }
 

examples/src/json_traits_name_macro_examples.cpp

@@ -37,11 +37,12 @@ namespace ns {
         BookCategory category_;
         std::string author_;
         std::string title_;
-        double price_;
-        Book2() = default;
+        double price_{0};
 
         JSONCONS_TYPE_TRAITS_FRIEND
     public:
+        Book2() = default;
+
         BookCategory category() const {return category_;}
 
         const std::string& author() const {return author_;}
@@ -281,7 +282,7 @@ void json_type_traits_book_examples()
                   << item.price << "\n";
     }
     std::cout << "\n";
-    encode_json(books1, std::cout, indenting::indent);
+    encode_json_pretty(books1, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(2)\n\n";
@@ -294,7 +295,7 @@ void json_type_traits_book_examples()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books2, std::cout, indenting::indent);
+    encode_json_pretty(books2, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(3)\n\n";
@@ -307,7 +308,7 @@ void json_type_traits_book_examples()
                   << item.price() << "\n";
     }
     std::cout << "\n";
-    encode_json(books3, std::cout, indenting::indent);
+    encode_json_pretty(books3, std::cout);
     std::cout << "\n\n";
 
     std::cout << "(4)\n\n";
@@ -320,7 +321,7 @@ void json_type_traits_book_examples()
                   << item.getPrice() << "\n";
     }
     std::cout << "\n";
-    encode_json(books4, std::cout, indenting::indent);
+    encode_json_pretty(books4, std::cout);
     std::cout << "\n\n";
 }
 
@@ -352,7 +353,7 @@ void translate_ids_from_to_employees()
     std::cout << "\n";
 
     std::string output;
-    encode_json(company, output, indenting::indent);
+    encode_json_pretty(company, output);
     std::cout << "(2)\n" << output << "\n\n";
 }
 
@@ -382,7 +383,7 @@ void tidy_member()
     std::cout << "\n";
 
     std::string output;
-    encode_json(persons, output, indenting::indent);
+    encode_json_pretty(persons, output);
     std::cout << "(2)\n" << output << "\n";
 
 }