add the basic support of c++17

Author: 16bit-ykiko

CMakeLists.txt

@@ -1,16 +1,39 @@
-cmake_minimum_required(VERSION 3.26)
-project(magic)
+cmake_minimum_required(VERSION 3.22)
+project(magic-cpp)
 
 set(CMAKE_CXX_STANDARD 20)
-# set(CMAKE_CXX_FLAGS "-Werror -Wall -Waddress -Woverflow")
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-include_directories(include) 
+if(NOT MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
 
-add_executable(main test/main.cpp)
 
-add_executable(struct test/struct.cpp)
+include(FetchContent)
+FetchContent_Declare(
+        googletest
+        URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+        DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
 
-add_executable(type test/type.cpp)
+enable_testing()
+
+include_directories(include)
+
+# 使用通配符一次性添加多个测试文件
+file(GLOB TEST_SOURCES "test/*.cpp")
+
+# 创建一个包含所有测试文件的可执行文件
+add_executable(all_tests ${TEST_SOURCES})
+add_executable(main main.cpp)
+
+target_link_libraries(all_tests GTest::gtest_main)
+# 链接Google Test库到测试可执行文件
+
+# 使用Google Test自动发现所有测试并将其添加到测试套件中
+include(GoogleTest)
+gtest_discover_tests(all_tests)
 
-add_executable(enum test/enum.cpp)

generate.py

@@ -21,8 +21,8 @@ def main():
     with open(path.join(src, "struct_bind_of_field_access.code"), "w") as f:
         f.write(generate_struct_bind_of_field_access(args.fields))
 
-    with open(path.join(src, "template_parse.code"), "w") as f:
-        f.write(generate_template_parse(args.templates))
+    with open(path.join(src, "template.code"), "w") as f:
+        f.write(generate_template_traits(args.templates))
 
 
 if __name__ == "__main__":

include/magic/customized_type_name.h

@@ -0,0 +1,23 @@
+#ifndef MAGIC_CPP_CUSTOMIZED_TYPE_NAME_H
+#define MAGIC_CPP_CUSTOMIZED_TYPE_NAME_H
+#include "type_tree.h"
+
+template <>
+struct magic::type_info<std::size_t>
+{
+    constexpr static const char* name = "std::size_t";
+};
+
+template <>
+struct magic::type_info<std::string>
+{
+    constexpr static const char* name = "std::string";
+};
+
+template <>
+struct magic::type_info<std::string_view>
+{
+    constexpr static const char* name = "std::string_view";
+};
+
+#endif

include/magic/enum.h

@@ -2,54 +2,30 @@
 #define MAGIC_CPP_ENUM_H
 
 #include "macro.h"
-#include "string_view.h"
+
+#ifdef MAGIC_CPP_20
+#include "raw_name.h"
 #include <array>
-#include <iostream>
-#include <type_traits>
 
 #define ENUM_SEARCH_RANGE 32
 namespace magic
 {
     template <typename T>
     struct type_info;
-
-    template <auto value>
-    requires std::is_enum_v<decltype(value)>
-    constexpr auto name_of()
-    {
-        // clang-format off
-        string_view name = MAGIC_CPP_FUNCTION_NAME;
-        #if __clang__ || __GNUC__
-            std::size_t r1 = name.rfind("::");
-            std::size_t r2 = name.rfind("value = ");
-            std::size_t last = name.rfind("]");
-            name = (r1 != string_view::npos && r1 > r2) ? name.substr(r1 + 2, last) : name.substr(r2 + 8 , last);
-            return name.find(")") != string_view::npos ? "" : name;
-        #elif _MSC_VER
-            std::size_t r1 = name.rfind("::");
-            std::size_t r2 = name.rfind("name_of<");
-            std::size_t last = name.rfind(">");
-            name = (r1 != string_view::npos && r1 > r2) ? name.substr(r1 + 2, last) : name.substr(r2 + 8, last);
-            return name.find(")") != string_view::npos ? "" : name;
-        #else
-            static_assert(false, "not supported compiler");
-        #endif
-        // clang-format on
-    }
 } // namespace magic
 
 namespace magic::details
 {
     template <typename T, std::ptrdiff_t N = 0>
     consteval std::ptrdiff_t search_possible_enum_start()
     {
-        if constexpr (name_of<static_cast<T>(N)>() != "")
+        if constexpr (raw_name_of_enum<static_cast<T>(N)>() != "")
         {
             return N;
         }
         else if constexpr (std::is_signed_v<std::underlying_type_t<T>>)
         {
-            if constexpr (name_of<static_cast<T>(-N)>() != "")
+            if constexpr (raw_name_of_enum<static_cast<T>(-N)>() != "")
             {
                 return -N;
             }
@@ -68,7 +44,7 @@ namespace magic::details
     consteval std::ptrdiff_t search_possible_continuous_enum_max()
     {
         constexpr auto is_end = []<std::size_t... Is>(std::index_sequence<Is...>)
-        { return (name_of<static_cast<T>(N + Is)>().empty() && ...); }(std::make_index_sequence<8>{});
+        { return (raw_name_of_enum<static_cast<T>(N + Is)>().empty() && ...); }(std::make_index_sequence<8>{});
 
         if constexpr (is_end)
         {
@@ -130,9 +106,9 @@ namespace magic::details
     consteval auto search_possible_bit_field_enum_length()
     {
         constexpr auto max = sizeof(T) * 8;
-        std::size_t result = name_of<static_cast<T>(0)>() != "";
+        std::size_t result = raw_name_of_enum<static_cast<T>(0)>() != "";
         [&]<std::size_t... Is>(std::index_sequence<Is...>)
-        { ((name_of<static_cast<T>(1 << Is)>() != "" ? result++ : result), ...); }(std::make_index_sequence<max>{});
+        { ((raw_name_of_enum<static_cast<T>(1 << Is)>() != "" ? result++ : result), ...); }(std::make_index_sequence<max>{});
         return result;
     }
 
@@ -163,23 +139,23 @@ namespace magic::details
             constexpr auto start = enum_start<T>();
             constexpr auto max = enum_max<T>();
             constexpr auto length = max - start + 1;
-            std::array<string_view, length> names{};
-            split_initialize<T, length>([&]<std::size_t I>() { names[I] = name_of<static_cast<T>(start + I)>(); });
+            std::array<std::string_view, length> names{};
+            split_initialize<T, length>([&]<std::size_t I>() { names[I] = raw_name_of_enum<static_cast<T>(start + I)>(); });
             return names;
         }
         else
         {
             constexpr auto length = search_possible_bit_field_enum_length<T>();
-            std::array<string_view, length> names{};
-            constexpr auto has_zero = name_of<static_cast<T>(0)>() != "";
+            std::array<std::string_view, length> names{};
+            constexpr auto has_zero = raw_name_of_enum<static_cast<T>(0)>() != "";
             if constexpr (has_zero)
             {
-                names[0] = name_of<static_cast<T>(0)>();
-                split_initialize<T, length - 1>([&]<std::size_t I>() { names[I + 1] = name_of<static_cast<T>(1 << I)>(); });
+                names[0] = raw_name_of_enum<static_cast<T>(0)>();
+                split_initialize<T, length - 1>([&]<std::size_t I>() { names[I + 1] = raw_name_of_enum<static_cast<T>(1 << I)>(); });
             }
             else
             {
-                split_initialize<T, length>([&]<std::size_t I>() { names[I] = name_of<static_cast<T>(1 << I)>(); });
+                split_initialize<T, length>([&]<std::size_t I>() { names[I] = raw_name_of_enum<static_cast<T>(1 << I)>(); });
             }
             return names;
         }
@@ -196,13 +172,13 @@ namespace magic::details
     requires std::is_enum_v<T>
     struct Field
     {
-        constexpr static string_view name() { return name_of<static_cast<T>(N)>(); }
+        constexpr static std::string_view name() { return raw_name_of_enum<static_cast<T>(N)>(); }
 
         using type = T;
 
         constexpr static std::ptrdiff_t value() { return N; }
 
-        constexpr static string_view type_name() { return name_of<T>(); }
+        constexpr static std::string_view type_name() { return raw_name_of_enum<T>(); }
     };
 
     template <typename T>
@@ -220,7 +196,7 @@ namespace magic::details
         else
         {
             constexpr auto length = search_possible_bit_field_enum_length<T>();
-            constexpr auto has_zero = name_of<static_cast<T>(0)>() != "";
+            constexpr auto has_zero = raw_name_of_enum<static_cast<T>(0)>() != "";
             if constexpr (has_zero)
             {
                 f(Field<T, 0>{});
@@ -248,11 +224,11 @@ namespace magic
 
     template <typename T>
     requires std::is_enum_v<T>
-    constexpr auto& name_of(T value)
+    constexpr auto& raw_name_of_enum(T value)
     {
         constexpr auto start = enum_start<T>();
         return details::enum_names_storage<T>::names[static_cast<std::size_t>(value + start)];
     }
 } // namespace magic
-
+#endif
 #endif // MAGIC_CPP_ENUM_H