Добавлен natvis файл для MSVC отладчика.

Author: orefkov

CMakeLists.txt

@@ -1,10 +1,10 @@
-cmake_minimum_required (VERSION 3.20)
+cmake_minimum_required(VERSION 3.20)
 include(cmake/prelude.cmake)
 include(CMakeDependentOption)
 include(FetchContent)
 
-project (
-	simjson
+project(
+    simjson
     VERSION 1.0.0
     DESCRIPTION "Very simple json library"
     HOMEPAGE_URL "https://github.com/orefkov/simjson"
@@ -14,12 +14,12 @@ project (
 include(cmake/project-is-top-level.cmake)
 include(cmake/variables.cmake)
 
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
-    set (MSVC_COMPILER ON)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /Zc:strictStrings")
-elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-    set (CLANG_COMPILER ON)
-endif ()
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+    set(MSVC_COMPILER ON)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /Zc:strictStrings")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+    set(CLANG_COMPILER ON)
+endif()
 
 option(SIMJSON_BUILD_TESTS "Построить тесты" ON)
 option(SIMJSON_BENCHMARKS "Построить замеры производительности" OFF)
@@ -38,6 +38,11 @@ target_include_directories(
 
 target_compile_features(simjson_simjson PUBLIC cxx_std_20)
 
+# Для MSVC подключаем natvis файл для красивой отладки
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+    target_link_options(simjson_simjson PUBLIC "/natvis:${CMAKE_CURRENT_SOURCE_DIR}/for_debug/simjson.natvis")
+endif()
+
 set_target_properties(
     simjson_simjson PROPERTIES
     CXX_VISIBILITY_PRESET hidden
@@ -48,39 +53,39 @@ set_target_properties(
     OUTPUT_NAME simjson
 )
 
-function (Simstr)
-	set (SIMSTR_BUILD_TESTS OFF)
-	set (SIMSTR_BENCHMARKS OFF)
-    if (SIMJSON_SHARED)
-	    set (SIMSTR_SHARED On)
+function(Simstr)
+    set(SIMSTR_BUILD_TESTS OFF)
+    set(SIMSTR_BENCHMARKS OFF)
+    if(SIMJSON_SHARED)
+        set(SIMSTR_SHARED On)
     endif()
-	FetchContent_Declare(
-	  simstr
-	  GIT_REPOSITORY https://github.com/orefkov/simstr.git
-	  GIT_SHALLOW TRUE
-	  GIT_TAG rel.1.1.1
-	  FIND_PACKAGE_ARGS
-	)
-	FetchContent_MakeAvailable(simstr)
+    FetchContent_Declare(
+        simstr
+        GIT_REPOSITORY https://github.com/orefkov/simstr.git
+        GIT_SHALLOW TRUE
+        GIT_TAG 04d253e
+        FIND_PACKAGE_ARGS
+    )
+    FetchContent_MakeAvailable(simstr)
 endfunction()
 
 Simstr()
- 
+
 target_link_libraries(simjson_simjson PUBLIC simstr::simstr)
 
-if (SIMJSON_SHARED)
+if(SIMJSON_SHARED)
     add_compile_definitions(SIMJSON_SHARED)
     target_compile_definitions(simjson_simjson PRIVATE SIMJSON_EXPORT)
 endif(SIMJSON_SHARED)
 
-if (SIMJSON_BUILD_TESTS)
+if(SIMJSON_BUILD_TESTS)
     enable_testing()
-    set (BUILD_TESTS ON)
+    set(BUILD_TESTS ON)
     # Load and build GTest
     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
+        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
     )
 
     # For Windows: Prevent overriding the parent project's compiler/linker settings
@@ -89,46 +94,46 @@ if (SIMJSON_BUILD_TESTS)
     add_subdirectory(tests)
 endif()
 
-function (GBencmark)
+function(GBencmark)
     # Load and build Google benchmarks
     include(FetchContent)
     FetchContent_Declare(
-      googlebench
-      # Specify the commit you depend on and update it regularly.
-      URL https://github.com/google/benchmark/archive/refs/tags/v1.7.0.zip
+        googlebench
+        # Specify the commit you depend on and update it regularly.
+        URL https://github.com/google/benchmark/archive/refs/tags/v1.7.0.zip
     )
-    set (CMAKE_CXX_STANDARD 20)
-    set (BENCHMARK_ENABLE_TESTING OFF)
-    set (BENCHMARK_ENABLE_LTO OFF)
-    set (BENCHMARK_ENABLE_INSTALL OFF)
-    set (BENCHMARK_INSTALL_DOCS OFF)
-    set (BENCHMARK_DOWNLOAD_DEPENDENCIES ON)
-    set (BENCHMARK_ENABLE_GTEST_TESTS OFF)
+    set(CMAKE_CXX_STANDARD 20)
+    set(BENCHMARK_ENABLE_TESTING OFF)
+    set(BENCHMARK_ENABLE_LTO OFF)
+    set(BENCHMARK_ENABLE_INSTALL OFF)
+    set(BENCHMARK_INSTALL_DOCS OFF)
+    set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON)
+    set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
     add_compile_definitions(BENCHMARK_STATIC_DEFINE)
     FetchContent_MakeAvailable(googlebench)
 endfunction()
 
-if (SIMJSON_BENCHMARKS)# AND CMAKE_BUILD_TYPE STREQUAL Release)
-    set (BUILD_BENCHMARKS ON)
+if(SIMJSON_BENCHMARKS) # AND CMAKE_BUILD_TYPE STREQUAL Release)
+    set(BUILD_BENCHMARKS ON)
     GBencmark()
     add_subdirectory(bench)
-endif ()
+endif()
 
 # ---- Install rules ----
 
 if(NOT CMAKE_SKIP_INSTALL_RULES)
-  include(cmake/install-rules.cmake)
+    include(cmake/install-rules.cmake)
 endif()
 
 # ---- Developer mode ----
 
 if(NOT simjsons_DEVELOPER_MODE)
-  return()
+    return()
 elseif(NOT PROJECT_IS_TOP_LEVEL)
-  message(
-      AUTHOR_WARNING
-      "Developer mode is intended for developers of simjson"
-  )
+    message(
+        AUTHOR_WARNING
+        "Developer mode is intended for developers of simjson"
+    )
 endif()
 
 include(cmake/dev-mode.cmake)

for_debug/simjson.natvis

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Файл с описанием визуализации simjson для Visual Studio -->
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+  <Type Name="simjson::JsonValueTempl&lt;*&gt;">
+    <DisplayString Condition="type_==Json::Type::Null">Null</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Boolean">bool: {val_.boolean}</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Text">text: {val_.text}</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Integer">int: {val_.integer}</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Real">real: {val_.real}</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Object">obj: {*val_.object}</DisplayString>
+    <DisplayString Condition="type_==Json::Type::Array">arr: {*val_.array}</DisplayString>
+    <DisplayString>[undefined]</DisplayString>
+	<Expand>
+		<ExpandedItem Condition="type_==Json::Type::Object">*val_.object</ExpandedItem>
+		<ExpandedItem Condition="type_==Json::Type::Array">*val_.array</ExpandedItem>
+	</Expand>
+  </Type>
+</AutoVisualizer>

tests/CMakeLists.txt

@@ -1,7 +1,6 @@
 # CMakeList.txt : CMake project for core_as, include source and define
 # project specific logic here.
 #
-
 add_executable(test_json test_json.cpp)
 target_link_libraries(test_json simjson_simjson gtest_main)
 add_test(NAME test_json COMMAND test_json)