Merge pull request #288 from bbbgan/master

qicosmos · Jun 22, 2024 · e0a65fd · e0a65fd
2 parents c879c65 + 03000d4
commit e0a65fd
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 11 deletions.
diff --git a/iguana/dynamic.hpp b/iguana/dynamic.hpp
@@ -9,38 +9,84 @@ IGUANA_INLINE constexpr size_t member_offset(T* t, U T::*member) {
   return (char*)&(t->*member) - (char*)t;
 }
 
-template <typename T>
+constexpr inline uint8_t ENABLE_JSON = 0x01;
+constexpr inline uint8_t ENABLE_YAML = 0x02;
+constexpr inline uint8_t ENABLE_XML = 0x04;
+constexpr inline uint8_t ENABLE_PB = 0x08;
+constexpr inline uint8_t ENABLE_ALL = 0x0F;
+
+template <typename T, uint8_t ENABLE_FLAG = ENABLE_PB>
 struct base_impl : public base {
   void to_pb(std::string& str) override {
-    to_pb_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_PB) {
+      to_pb_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Protobuf Disabled");
+    }
   }
 
   void from_pb(std::string_view str) override {
-    from_pb_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_PB) {
+      from_pb_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Protobuf Disabled");
+    }
   }
 
   void to_json(std::string& str) override {
-    to_json_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_JSON) {
+      to_json_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Json Disabled");
+    }
   }
 
   void from_json(std::string_view str) override {
-    from_json_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_JSON) {
+      from_json_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Json Disabled");
+    }
   }
 
   void to_xml(std::string& str) override {
-    to_xml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_XML) {
+      to_xml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Xml Disabled");
+    }
   }
 
   void from_xml(std::string_view str) override {
-    from_xml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_XML) {
+      from_xml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Xml Disabled");
+    }
   }
 
   void to_yaml(std::string& str) override {
-    to_yaml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_YAML) {
+      to_yaml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Yaml Disabled");
+    }
   }
 
   void from_yaml(std::string_view str) override {
-    from_yaml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    if constexpr (ENABLE_FLAG & ENABLE_YAML) {
+      from_yaml_adl((iguana_adl_t*)nullptr, *(static_cast<T*>(this)), str);
+    }
+    else {
+      throw std::runtime_error("Yaml Disabled");
+    }
   }
 
   iguana::detail::field_info get_field_info(std::string_view name) override {

diff --git a/lang/struct_pb_intro.md b/lang/struct_pb_intro.md
@@ -68,7 +68,7 @@ struct my_struct {
 };
 REFLECTION(my_struct, x, y, z);
 
-struct nest1 : public iguana::base_imple<nest1> {
+struct nest1 : public iguana::base_impl<nest1> {
   nest1() = default;
   nest1(std::string s, my_struct t, int d)
       : name(std::move(s)), value(t), var(d) {}

diff --git a/test/test_pb.cpp b/test/test_pb.cpp
@@ -103,7 +103,7 @@ struct test_pb_st6 {
 };
 REFLECTION(test_pb_st6, x, y);
 
-struct pair_t PUBLIC(pair_t) {
+struct pair_t : public iguana::base_impl<pair_t, iguana::ENABLE_ALL> {
   pair_t() = default;
   pair_t(int a, int b) : x(a), y(b) {}
   int x;