Merge pull request #46 from steinwurf/improve-unicode-escape-sequence-support

improve unicode escape sequence support

Author: jpihl

NEWS.rst

@@ -6,7 +6,7 @@ every change, see the Git log.
 
 Latest
 ------
-* tbd
+* Patch: Better support for unicode escape sequences.
 
 10.0.0
 ------

src/bourne/json.cpp

@@ -324,16 +324,26 @@ std::string json::to_string() const
     assert(is_string());
     const std::string& str = *m_internal.m_string;
     std::string output;
-    for (std::size_t i = 0; i < str.length(); ++i)
+    auto size = str.length();
+    for (std::size_t i = 0; i < size; ++i)
     {
         switch (str[i])
         {
         case '\"':
             output += "\\\"";
             break;
         case '\\':
-            output += "\\";
+        {
+            // Check if the next character is a unicode escape sequence
+            if (i + 1 < size && str[i + 1] == 'u')
+            {
+                output += "\\u";
+                i += 1;
+                break;
+            }
+            output += "\\\\";
             break;
+        }
         case '\b':
             output += "\\b";
             break;

test/src/test_json.cpp

@@ -287,3 +287,18 @@ TEST(test_json, test_keys)
     }
     EXPECT_EQ(4U, obj.keys().size());
 }
+
+TEST(test_json, test_unicode_dump)
+{
+    {
+        bourne::json object({"unicode", "\u00E6"});
+        std::string expected = "{\"unicode\":\"\u00E6\"}";
+        EXPECT_EQ(expected, object.dump_min());
+    }
+
+    {
+        bourne::json object({"bad_unicode", "\\u0"});
+        std::string expected = "{\"bad_unicode\":\"\\u0\"}";
+        EXPECT_EQ(expected, object.dump_min());
+    }
+}

test/src/test_parser.cpp

@@ -194,3 +194,21 @@ TEST(test_parser, test_exception_throw)
     }
     EXPECT_TRUE(caught);
 }
+
+TEST(test_parser, test_parse_backslash)
+{
+    std::error_code error;
+    std::string json_string = "{\"bourne\":\"\\\\\"}";
+    auto result = bourne::detail::parser::parse(json_string, error);
+    ASSERT_FALSE((bool)error);
+    EXPECT_EQ(json_string, result.dump_min());
+}
+
+TEST(test_parser, test_parse_unicode)
+{
+    std::error_code error;
+    std::string json_string = "{\"bourne\":\"\\u0026\"}";
+    auto result = bourne::detail::parser::parse(json_string, error);
+    ASSERT_FALSE((bool)error);
+    ASSERT_EQ(json_string, result.dump_min());
+}