Refactor iguana2

.github/workflows/linux-gcc.yml

@@ -58,31 +58,31 @@ jobs:
       working-directory: ${{ github.workspace }}/build
       run: ctest -C ${{ matrix.mode }} -j 1 -V
 
-  ubuntu_gcc8:
-    strategy:
-      matrix:
-        mode: [ Debug, Release ]
-        cpp_version: [17]
-    runs-on: ubuntu-20.04
+  # ubuntu_gcc8:
+  #   strategy:
+  #     matrix:
+  #       mode: [ Debug, Release ]
+  #       cpp_version: [17]
+  #   runs-on: ubuntu-20.04
 
-    steps:
-    - name: check out
-      uses: actions/checkout@v3
+  #   steps:
+  #   - name: check out
+  #     uses: actions/checkout@v3
 
-    - name: Install GCC8
-      run: |
-        sudo apt update
-        sudo apt install gcc-8 g++-8
+  #   - name: Install GCC8
+  #     run: |
+  #       sudo apt update
+  #       sudo apt install gcc-8 g++-8
 
-    - name: checkout gcc version
-      run: gcc-8 --version
+  #   - name: checkout gcc version
+  #     run: gcc-8 --version
 
-    - name: configure cmake
-      run: CXX=g++-8 CC=gcc-8 cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }}
+  #   - name: configure cmake
+  #     run: CXX=g++-8 CC=gcc-8 cmake -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ matrix.mode }} -DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }}
 
-    - name: build project
-      run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.mode }}
+  #   - name: build project
+  #     run: cmake --build ${{ github.workspace }}/build --config ${{ matrix.mode }}
 
-    - name: test
-      working-directory: ${{ github.workspace }}/build
-      run: ctest -C ${{ matrix.mode }} -j 1 -V
+  #   - name: test
+  #     working-directory: ${{ github.workspace }}/build
+  #     run: ctest -C ${{ matrix.mode }} -j 1 -V

CMakeLists.txt

@@ -75,7 +75,7 @@ set(YAML_EXAMPLE
 	example/yaml_example.cpp
 )
 
-set(TEST_SOME test/test.cpp)
+set(TEST_SOME test/test_some.cpp)
 set(TEST_UT test/unit_test.cpp)
 set(TEST_JSON_FILES test/test_json_files.cpp)
 set(TEST_XML test/test_xml.cpp)
@@ -88,6 +88,7 @@ set(TEST_UTIL test/test_util.cpp)
 set(TEST_XMLNOTHROW test/test_xml_nothrow.cpp)
 set(TEST_PB test/test_pb.cpp)
 set(TEST_PROTO test/test_proto3.cpp)
+set(TEST_CPP20 test/test_cpp20.cpp)
 set(PB_BENCHMARK benchmark/pb_benchmark.cpp)
 
 add_executable(json_example 	${JSON_EXAMPLE})
@@ -105,6 +106,7 @@ add_executable(yaml_benchmark ${YAMLBENCH})
 add_executable(test_nothrow ${TEST_NOTHROW})
 add_executable(test_util ${TEST_UTIL})
 add_executable(test_pb ${TEST_PB})
+add_executable(test_cpp20 ${TEST_CPP20})
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9)
@@ -166,4 +168,5 @@ add_test(NAME test_yaml COMMAND test_yaml)
 add_test(NAME test_nothrow COMMAND test_nothrow)
 add_test(NAME test_util COMMAND test_util)
 add_test(NAME test_xml_nothrow COMMAND test_xml_nothrow)
-add_test(NAME test_pb COMMAND test_pb)
+add_test(NAME test_pb COMMAND test_pb)
+add_test(NAME test_cpp20 COMMAND test_cpp20)

benchmark/json_benchmark.cpp

@@ -1,7 +1,7 @@
 #include "json_benchmark.h"
 
 class ScopedTimer {
-public:
+ public:
   ScopedTimer(const char *name)
       : m_name(name), m_beg(std::chrono::high_resolution_clock::now()) {}
   ScopedTimer(const char *name, uint64_t &ns) : ScopedTimer(name) {
@@ -18,7 +18,7 @@ class ScopedTimer {
                 << std::setw(12) << dur.count() << " ns\n";
   }
 
-private:
+ private:
   const char *m_name;
   std::chrono::time_point<std::chrono::high_resolution_clock> m_beg;
   uint64_t *m_ns = nullptr;
@@ -60,7 +60,8 @@ struct fixed_name_object_t {
   std::string name4{};
 
 #ifdef HAS_RAPIDJSON
-  template <typename Writer> void Serialize(Writer &writer) const {
+  template <typename Writer>
+  void Serialize(Writer &writer) const {
     writer.StartObject();
     writer.String("name0");
     writer.String(name0);
@@ -76,14 +77,15 @@ struct fixed_name_object_t {
   }
 #endif
 };
-REFLECTION(fixed_name_object_t, name0, name1, name2, name3, name4);
+YLT_REFL(fixed_name_object_t, name0, name1, name2, name3, name4);
 
 struct nested_object_t {
   std::vector<std::array<double, 3>> v3s{};
   std::string id{};
 
 #ifdef HAS_RAPIDJSON
-  template <typename Writer> void Serialize(Writer &writer) const {
+  template <typename Writer>
+  void Serialize(Writer &writer) const {
     writer.StartObject();
     writer.String("v3s");
     writer.StartArray();
@@ -103,7 +105,7 @@ struct nested_object_t {
   }
 #endif
 };
-REFLECTION(nested_object_t, v3s, id);
+YLT_REFL(nested_object_t, v3s, id);
 
 struct another_object_t {
   std::string string{};
@@ -112,7 +114,8 @@ struct another_object_t {
   nested_object_t nested_object{};
 
 #ifdef HAS_RAPIDJSON
-  template <typename Writer> void Serialize(Writer &writer) const {
+  template <typename Writer>
+  void Serialize(Writer &writer) const {
     writer.StartObject();
     writer.String("string");
     writer.String(string);
@@ -126,7 +129,7 @@ struct another_object_t {
   }
 #endif
 };
-REFLECTION(another_object_t, string, another_string, boolean, nested_object);
+YLT_REFL(another_object_t, string, another_string, boolean, nested_object);
 
 struct obj_t {
   //   fixed_object_t fixed_object{};
@@ -139,7 +142,8 @@ struct obj_t {
   bool another_bool{};
 
 #ifdef HAS_RAPIDJSON
-  template <typename Writer> void Serialize(Writer &writer) const {
+  template <typename Writer>
+  void Serialize(Writer &writer) const {
     writer.StartObject();
     writer.String("fixed_name_object");
     fixed_name_object.Serialize(writer);
@@ -167,8 +171,8 @@ struct obj_t {
   }
 #endif
 };
-REFLECTION(obj_t, fixed_name_object, another_object, string_array, string,
-           number, boolean, another_bool);
+YLT_REFL(obj_t, fixed_name_object, another_object, string_array, string, number,
+         boolean, another_bool);
 
 obj_t create_object() {
   fixed_name_object_t fix_obj = {"James", "Abraham", "Susan", "Frank",
@@ -283,7 +287,9 @@ void test_from_json_file() {
   for (auto &pair : test_map) {
     auto content = iguana::json_file_content(pair.first);
     std::visit(
-        [&](auto &&arg) { test_from_json(pair.first, arg, content, 10); },
+        [&](auto &&arg) {
+          test_from_json(pair.first, arg, content, 10);
+        },
         pair.second);
   }
 }