From: Petri Lehtinen <petri@digip.org>
Date: Thu, 4 Feb 2010 19:02:35 +0000 (+0200)
Subject: C++: Rename some functions to better match the C API
X-Git-Tag: v1.3~16^2~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=b8059a18801ae067d13f1e5d9e872e4cf11bc58f

C++: Rename some functions to better match the C API

Value::save_file -> Value::dump_file
Value::save_string -> Value::dumps
load_string -> loads
---

diff --git a/src/jansson.hpp b/src/jansson.hpp
index f435493..de55b75 100644
--- a/src/jansson.hpp
+++ b/src/jansson.hpp
@@ -127,10 +127,10 @@ namespace json {
             inline _Base& insert_at(unsigned int index, const Value& value);
 
             // write the value to a file
-            inline int save_file(const char* path, int flags = 0) const;
+            inline int dump_file(const char* path, int flags = 0) const;
 
             // write the value to a string (caller must deallocate with free()!)
-            inline char* save_string(int flags = 0) const;
+            inline char* dumps(int flags = 0) const;
         };
 
         // represents any JSON value, private base
@@ -291,7 +291,7 @@ namespace json {
     inline Value load_file(const char* path, json_error_t* error = 0);
 
     // load a string as a JSON value
-    inline Value load_string(const char* string, json_error_t* error = 0);
+    inline Value loads(const char* string, json_error_t* error = 0);
 
 } // namespace json
 
diff --git a/src/jansson.ipp b/src/jansson.ipp
index b80d1af..fcb4a0c 100644
--- a/src/jansson.ipp
+++ b/src/jansson.ipp
@@ -270,13 +270,13 @@ namespace json {
 
         // write the value to a file
         template <typename _Base>
-        int ValueBase<_Base>::save_file(const char* path, int flags) const {
+        int ValueBase<_Base>::dump_file(const char* path, int flags) const {
             return json_dump_file(_Base::as_json(), path, flags);
         }
 
         // write the value to a string (caller must deallocate with free()!)
         template <typename _Base>
-        char* ValueBase<_Base>::save_string(int flags) const {
+        char* ValueBase<_Base>::dumps(int flags) const {
             return json_dumps(_Base::as_json(), flags);
         }
 
@@ -440,7 +440,7 @@ namespace json {
     }
 
     // load a string as a JSON value
-    Value load_string(const char* string, json_error_t* error) {
+    Value loads(const char* string, json_error_t* error) {
         return Value::take_ownership(json_loads(string, error));
     }
 
@@ -449,7 +449,7 @@ namespace json {
 // stream JSON value out
 std::ostream& operator<<(std::ostream& os, const json::Value& value) {
     // get the temporary serialize string
-    char* tmp = value.save_string();
+    char* tmp = value.dumps();
     if (tmp != 0) {
         // stream temp string out and release it
         os << tmp;
@@ -465,6 +465,6 @@ std::istream& operator>>(std::istream& is, json::Value& value) {
     while (is)
         tmp << static_cast<char>(is.get());
     // parse the buffered string
-    value = json::load_string(tmp.str().c_str());
+    value = json::loads(tmp.str().c_str());
     return is;
 }
diff --git a/test/suites/api/test_cpp.cpp b/test/suites/api/test_cpp.cpp
index 8a3b356..b8626ea 100644
--- a/test/suites/api/test_cpp.cpp
+++ b/test/suites/api/test_cpp.cpp
@@ -25,7 +25,7 @@ int main() {
     json::Value e1(json::load_file("suites/api/test_cpp.json"));
     json::Value e2(e1);
     json::Value e3;
-    json::Value e4(json::load_string("{\"foo\": true, \"bar\": \"test\"}"));
+    json::Value e4(json::loads("{\"foo\": true, \"bar\": \"test\"}"));
 
     ASSERT_TRUE(e1.is_object(), "e1 is not an object");
     ASSERT_TRUE(e2.is_object(), "e2 is not an object");
@@ -125,7 +125,7 @@ int main() {
     json::Value e12(json::object());
     e12.set_key("foo", json::Value("test"));
     e12.set_key("bar", json::Value(3));
-    char* out_cstr = e12.save_string(0);
+    char* out_cstr = e12.dumps(0);
     std::string out(out_cstr);
     free(out_cstr);
     ASSERT_EQ(out, "{\"bar\": 3, \"foo\": \"test\"}", "object did not serialize as expected");