Обновлена используемая версия simstr

Author: orefkov

CMakeLists.txt

@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.20)
 include(cmake/prelude.cmake)
 include(CMakeDependentOption)
 include(FetchContent)
 
 project(
     simjson
-    VERSION 1.2.3
+    VERSION 1.2.4
     DESCRIPTION "Very simple json library"
     HOMEPAGE_URL "https://github.com/orefkov/simjson"
     LANGUAGES CXX
@@ -67,8 +68,8 @@ function(add_simstr)
         simstr
         GIT_REPOSITORY https://github.com/orefkov/simstr.git
         GIT_SHALLOW TRUE
-        GIT_TAG tags/rel1.2.6
-        FIND_PACKAGE_ARGS NAMES simstr
+        GIT_TAG e62493a #tags/rel1.6.6
+        FIND_PACKAGE_ARGS NAMES "simstr 1.6.7"
     )
     FetchContent_MakeAvailable(simstr)
 endfunction()
@@ -91,13 +92,17 @@ if(SIMJSON_BUILD_TESTS)
     FetchContent_Declare(
         googletest
         # Specify the commit you depend on and update it regularly.
-        URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip
-        FIND_PACKAGE_ARGS NAMES GTest
+        URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
+        FIND_PACKAGE_ARGS NAMES "GTest 1.17.0"
     )
     # For Windows: Prevent overriding the parent project's compiler/linker settings
     set(gtest_force_shared_crt FALSE CACHE BOOL "" FORCE)
     FetchContent_MakeAvailable(googletest)
     add_subdirectory(tests)
+    if(TARGET gtest)
+        target_compile_features(gtest PUBLIC cxx_std_23)
+        target_compile_features(gtest_main PUBLIC cxx_std_23)
+    endif()
 endif()
 
 # ---- Install rules ----

docs/Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "simjson"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.2.1
+PROJECT_NUMBER         = 1.2.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a

docs/Doxyfile_ru

@@ -48,7 +48,7 @@ PROJECT_NAME           = "simjson"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.2.1
+PROJECT_NUMBER         = 1.2.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a

include/simjson/json.h

@@ -1,4 +1,4 @@
-/*
+/*
  * (c) Проект "SimJson", Александр Орефков orefkov@gmail.com
  * ver. 1.0
  * Классы для работы с JSON
@@ -96,7 +96,7 @@ concept JsonType = std::is_integral_v<std::remove_cvref_t<T>> ||
     std::is_constructible_v<sstring<K>, T>;
 
 template<typename T, typename K>
-concept JsonKeyType = std::convertible_to<T, simple_str<K>> ||
+concept JsonKeyType = std::convertible_to<T, str_src<K>> ||
     std::same_as<std::remove_cvref_t<T>, KeyType<K>>;
 
 template<typename T, typename K>
@@ -753,7 +753,13 @@ class JsonValueTempl : public Json {
      * JsonParseResult - parsing error code, Success if successful;
      * unsigned line, unsigned col - in case of an error, these are the line/column numbers where the error occurred.
      */
-    static std::tuple<json_value, JsonParseResult, unsigned, unsigned> parse(ssType jsonString);
+    struct parse_result {
+        json_value value;
+        JsonParseResult err;
+        unsigned line;
+        unsigned col;
+    };
+    static parse_result parse(ssType jsonString);
     /*!
      * @ru @brief Сериализовать json-значение в строку.
      * @param stream - строка, в которую сохранять.
@@ -891,23 +897,26 @@ struct StreamedJsonParser : StreamedJsonParserBase {
 };
 
 template<typename K>
-std::tuple<JsonValueTempl<K>, JsonParseResult, unsigned, unsigned> JsonValueTempl<K>::parse(ssType jsonString) {
+JsonValueTempl<K>::parse_result JsonValueTempl<K>::parse(ssType jsonString) {
     StreamedJsonParser<K> parser;
     auto res = parser.parseAll(jsonString);
     return {std::move(parser.result_), res, parser.line_, parser.col_};
 }
 
-/// @ru Алиас для JsonValue с символами u8s.
-/// @en Alias ​​for JsonValue with u8s characters.
+/// @ru Алиас для JsonValue с символами char.
+/// @en Alias ​​for JsonValue with char characters.
 using JsonValue = JsonValueTempl<u8s>;
-/// @ru Алиас для JsonValue с символами uws.
-/// @en Alias ​​for JsonValue with uws symbols.
+/// @ru Алиас для JsonValue с символами char8_t.
+/// @en Alias ​​for JsonValue with char8_t characters.
+using JsonValueB = JsonValueTempl<ubs>;
+/// @ru Алиас для JsonValue с символами wchar_t.
+/// @en Alias ​​for JsonValue with wchar_tsymbols.
 using JsonValueW = JsonValueTempl<uws>;
-/// @ru Алиас для JsonValue с символами u16s.
-/// @en Alias ​​for JsonValue with u16s characters.
+/// @ru Алиас для JsonValue с символами char16_t.
+/// @en Alias ​​for JsonValue with char16_t characters.
 using JsonValueU = JsonValueTempl<u16s>;
-/// @ru Алиас для JsonValue с символами u32s.
-/// @en Alias ​​for JsonValue with u32s characters.
+/// @ru Алиас для JsonValue с символами char32_t.
+/// @en Alias ​​for JsonValue with char32_t characters.
 using JsonValueUU = JsonValueTempl<u32s>;
 
 /// @ru Один объект "пустышка".

readme.md

@@ -3,7 +3,7 @@
 
 Designed to work with JSON when using the [simstr](https://github.com/orefkov/simstr) library.
 
-Version 1.2.3.
+Version 1.2.4.
 
 <span class="obfuscator"><a href="readme_ru.md">On Russian | По-русски</a></span>
 
@@ -15,6 +15,9 @@ for working with small config files - read, modify, write. However, it also cope
 For json objects, `std::unordered_map` is used, in the form of `hashStrMap<K, JsonValueTemp<K>>`,
 for arrays - `std::vector<JsonValueTemp<K>>`, strings are stored in `sstring<K>`.
 
+## Generated documentation
+[Located here](https://orefkov.github.io/simjson/docs_en/)
+
 ## Key features of the library
 - Works with all simstr strings.
 - Supports working with strings `char`, `char16_t`, `char32_t`, `wchar_t`.
@@ -180,6 +183,3 @@ void read_config_from_file(ssa folder, ssa file_name) {
     EXPECT_EQ(json2.store(false, true), "{\"four\":4,\"one\":1,\"three\":3,\"two\":2}");
 
 ```
-
-## Generated documentation
-[Located here](https://snegopat.ru/simjson/docs/en/)

readme_ru.md

@@ -3,7 +3,7 @@
 
 Предназначена для работы с JSON при использовании библиотеки [simstr](https://github.com/orefkov/simstr).
 
-Версия 1.2.3.
+Версия 1.2.4.
 
 <span class="obfuscator"><a href="readme.md">On English | По-английски</a></span>
 
@@ -15,6 +15,9 @@
 Для json-объектов используется `std::unordered_map`, в лице `hashStrMap<K, JsonValueTemp<K>>`,
 для массивов - `std::vector<JsonValueTemp<K>>`, строки хранятся в `sstring<K>`.
 
+## Сгенерированная документация
+[Находится здесь](https://orefkov.github.io/simjson/docs_ru/)
+
 ## Основные возможности библиотеки
 - Работает со всеми строками simstr.
 - Поддерживает работу со строками `char`, `char16_t`, `char32_t`, `wchar_t`.
@@ -180,6 +183,3 @@ void read_config_from_file(ssa folder, ssa file_name) {
     EXPECT_EQ(json2.store(false, true), "{\"four\":4,\"one\":1,\"three\":3,\"two\":2}");
 
 ```
-
-## Сгенерированная документация
-[Находится здесь](https://snegopat.ru/simjson/docs/ru/)

src/json.cpp

@@ -363,9 +363,9 @@ SIMJSON_API typename JsonValueTempl<K>::strType JsonValueTempl<K>::to_text() con
         return e_num<K>(val_.integer);
     case Real:
         if constexpr (is_one_of_std_char_v<K>) {
-            return e_real<K>(val_.real);
+            return e_num<K>(val_.real);
         } else {
-            return lstringa<64>{e_real<u8s>(val_.real)};
+            return lstringa<64>{e_num<u8s>(val_.real)};
         }
     default:
         return {};
@@ -1146,11 +1146,13 @@ stringa get_file_content(stra filePath) {
 
 // Явно инстанцируем шаблоны для этих типов
 template class JsonValueTempl<u8s>;
+//template class JsonValueTempl<ubs>;
 template class JsonValueTempl<u16s>;
 template class JsonValueTempl<u32s>;
 template class JsonValueTempl<wchar_t>;
 
 template struct StreamedJsonParser<u8s>;
+template struct StreamedJsonParser<ubs>;
 template struct StreamedJsonParser<u16s>;
 template struct StreamedJsonParser<u32s>;
 template struct StreamedJsonParser<wchar_t>;