- Обновил версию simstr

- Исправил ошибку сериализации
- Дополнил тесты

Author: orefkov

CMakeLists.txt

@@ -62,7 +62,7 @@ function(add_simstr)
         simstr
         GIT_REPOSITORY https://github.com/orefkov/simstr.git
         GIT_SHALLOW TRUE
-        GIT_TAG fb0e2f1
+        GIT_TAG rel.1.2.1
         FIND_PACKAGE_ARGS NAMES simstr
     )
     FetchContent_MakeAvailable(simstr)

src/json.cpp

@@ -1,10 +1,10 @@
-/*
+/*
  * (c) Проект "SimJson", Александр Орефков orefkov@gmail.com
  * ver. 1.0
  * Классы для работы с JSON
  */
 
- #include <simjson/json.h>
+#include <simjson/json.h>
 #include <cmath>
 #include <algorithm>
 #include <fstream>
@@ -16,6 +16,7 @@ using namespace simstr::literals;
 template<typename K>
 struct expr_json_str {
     using symb_type = K;
+    using test_type = std::make_unsigned_t<K>;
     using ssType = typename JsonValueTempl<K>::ssType;
     ssType text;
     size_t l;
@@ -28,7 +29,7 @@ struct expr_json_str {
         const K* ptr = text.symbols();
         size_t add = 0;
         for (size_t i = text.length(); i-- ;) {
-            K s = *ptr++;
+            test_type s = (test_type)*ptr++;
             switch (s) {
             case '\b':
             case '\f':
@@ -86,7 +87,7 @@ struct expr_json_str {
         const K* r = text.symbols();
         size_t lenOfText = text.length(), lenOfTail = l - lenOfText;
         while (lenOfTail) {
-            K s = *r++;
+            test_type s = (test_type)*r++;
             switch (s) {
             case '\"':
                 *ptr++ = '\\';

tests/test_json.cpp

@@ -378,6 +378,78 @@ TEST(SimJson, JsonStoreString) {
 })");
 }
 
+TEST(SimJson, JsonStoreString16) {
+    JsonValueU json {
+        {u"p1", 1},
+        {u"p3"_h, true},
+        {u"p2"_h, 2},
+        {u"p4"_h, {1, 2, false, Json::null, u"test\ntest\x01", Json::emptyObject, Json::emptyArray}}
+    };
+    EXPECT_EQ(stringu{json.store(false, true)}, uR"({"p1":1,"p2":2,"p3":true,"p4":[1,2,false,null,"test\ntest\u0001",{},[]]})");
+    EXPECT_EQ(stringu{json.store(true, true)}, uR"({
+  "p1": 1,
+  "p2": 2,
+  "p3": true,
+  "p4": [
+    1,
+    2,
+    false,
+    null,
+    "test\ntest\u0001",
+    {},
+    []
+  ]
+})");
+}
+
+TEST(SimJson, JsonStoreString32) {
+    JsonValueUU json {
+        {U"p1", 1},
+        {U"p3"_h, true},
+        {U"p2"_h, 2},
+        {U"p4"_h, {1, 2, false, Json::null, U"test\ntest\x01", Json::emptyObject, Json::emptyArray}}
+    };
+    EXPECT_EQ(stringuu{json.store(false, true)}, UR"({"p1":1,"p2":2,"p3":true,"p4":[1,2,false,null,"test\ntest\u0001",{},[]]})");
+    EXPECT_EQ(stringuu{json.store(true, true)}, UR"({
+  "p1": 1,
+  "p2": 2,
+  "p3": true,
+  "p4": [
+    1,
+    2,
+    false,
+    null,
+    "test\ntest\u0001",
+    {},
+    []
+  ]
+})");
+}
+
+TEST(SimJson, JsonStoreStringW) {
+    JsonValueW json {
+        {L"p1", 1},
+        {L"p3"_h, true},
+        {L"p2"_h, 2},
+        {L"p4"_h, {1, 2, false, Json::null, L"test\ntest\x01", Json::emptyObject, Json::emptyArray}}
+    };
+    EXPECT_EQ(stringw{json.store(false, true)}, LR"({"p1":1,"p2":2,"p3":true,"p4":[1,2,false,null,"test\ntest\u0001",{},[]]})");
+    EXPECT_EQ(stringw{json.store(true, true)}, LR"({
+  "p1": 1,
+  "p2": 2,
+  "p3": true,
+  "p4": [
+    1,
+    2,
+    false,
+    null,
+    "test\ntest\u0001",
+    {},
+    []
+  ]
+})");
+}
+
 TEST(SimJson, JsonThrow) {
     JsonValue val = 10;
     lstringa<100> err_descr;
@@ -428,44 +500,35 @@ TEST(SimJson, JsonStdInitMap) {
     EXPECT_EQ(json2.type(), Json::Object);
     EXPECT_EQ(json2.store(false, true), "{\"four\":4,\"one\":1,\"three\":3,\"two\":2}");
 }
-    /*
-stringa getFileContent(stra fileName) {
-    std::ifstream file(fileName, std::ios::binary | std::ios::ate);
-    std::streamsize size = file.tellg();
-    file.seekg(0, std::ios::beg);
-    lstringsa<0> result;
-    file.read(result.reserve(size), size);
-    return result;
-}
 
+#if 0
 TEST(SimJson, JsonParseBig) {
-    {
-        stringa content1 = get_file_content("citm_catalog.json");
-        stringa content2 = get_file_content("canada.json");
-        stringa content3 = get_file_content("twitter.json");
-
-        auto t1 = std::chrono::high_resolution_clock::now();
-
-        for (size_t idx = 0; idx < 10; idx++) {
-            auto json1 = JsonValue::parse(content1);
-            EXPECT_EQ(std::get<1>(json1), JsonParseResult::Success);
-            auto json2 = JsonValue::parse(content2);
-            EXPECT_EQ(std::get<1>(json2), JsonParseResult::Success);
-            auto json3 = JsonValue::parse(content3);
-            EXPECT_EQ(std::get<1>(json3), JsonParseResult::Success);
-        }
+    stringa content1 = get_file_content("citm_catalog.json");
+    stringa content2 = get_file_content("canada.json");
+    stringa content3 = get_file_content("twitter.json");
+
+    auto t1 = std::chrono::high_resolution_clock::now();
+
+    for (size_t idx = 0; idx < 10; idx++) {
+        auto json1 = JsonValue::parse(content1);
+        EXPECT_EQ(std::get<1>(json1), JsonParseResult::Success);
+        stringa t = std::get<0>(json1).store(true, false, ' ', 4);
+        EXPECT_EQ(content1.length(), t.length());
+        auto json2 = JsonValue::parse(content2);
+        EXPECT_EQ(std::get<1>(json2), JsonParseResult::Success);
+        t = std::get<0>(json2).store();
+        auto json3 = JsonValue::parse(content3);
+        EXPECT_EQ(std::get<1>(json3), JsonParseResult::Success);
+        t = std::get<0>(json3).store();
+    }
 
-        auto t2 = std::chrono::high_resolution_clock::now();
+    auto t2 = std::chrono::high_resolution_clock::now();
 
-        std::chrono::duration<double, std::milli> ms_double = t2 - t1;
+    std::chrono::duration<double, std::milli> ms_double = t2 - t1;
 
-        std::cout << "Parse at " << ms_double.count() / 10.0 << std::endl;
+    std::cout << "Parse and store at " << ms_double.count() / 10.0 << std::endl;
 
-        //EXPECT_TRUE(json1.is_object());
-        //EXPECT_TRUE(json2.is_object());
-        //EXPECT_TRUE(json3.is_object());
-    }
 }
-*/
+#endif
 
 } // namespace simjson::tests