From 58134818efb73da94c92ce04599ebbcff282d4b9 Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Tue, 27 Aug 2024 13:34:00 +0000
Subject: [PATCH] Fix attributes

---
 examples/src/attributes.cpp |  7 ++++---
 src/attributes.cpp          | 32 ++++++++++----------------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/examples/src/attributes.cpp b/examples/src/attributes.cpp
index 4aeaef2..310ee68 100644
--- a/examples/src/attributes.cpp
+++ b/examples/src/attributes.cpp
@@ -26,12 +26,13 @@ static_assert(utempl::GetAttributes<SomeStruct>() ==
 
 struct SomeOtherStruct {
   static_assert(utempl::OpenStruct<SomeOtherStruct>());
-  utempl::FieldAttribute<int, int> field1;
+  utempl::FieldAttribute<int, utempl::TypeList<int>> field1;
   utempl::FieldAttribute<int> field2;
-  utempl::FieldAttribute<std::string, void> field3;
+  utempl::FieldAttribute<std::string, utempl::TypeList<void>> field3;
   static_assert(utempl::CloseStruct());
 };
 
-static_assert(utempl::GetAttributes<SomeOtherStruct>() == utempl::Tuple{utempl::kTypeList<int>, utempl::NoInfo{}, utempl::kTypeList<void>});
+static_assert(utempl::GetAttributes<SomeOtherStruct>() ==
+              utempl::Tuple{utempl::kTypeList<int>, utempl::kTypeList<>, utempl::kTypeList<void>});
 
 auto main() -> int {};
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 36186b4..4756b80 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -35,25 +35,12 @@ export struct NoInfo {
   consteval auto operator==(const NoInfo&) const -> bool = default;
 };
 
-template <typename... Ts>
-struct FieldAttributeData {
-  using Type = TypeList<Ts...>;
-};
-
-template <>
-struct FieldAttributeData<> {
-  using Type = NoInfo;
-};
-
-template <typename T,
-          typename... Ts,
-          auto f = [] {},
-          typename Current = decltype(GetCurrentTagType<impl::AttributesTag, decltype(f)>())::Type,
-          auto = AddTypeToTag<impl::AttributesCounterTag<Current>, typename FieldAttributeData<Ts...>::Type, decltype(f)>()>
-consteval auto FieldAttributeHelper() -> T;
-
-export template <typename... Ts>
-using FieldAttribute = decltype(FieldAttributeHelper<Ts...>());
+export template <typename T,
+                 typename O = TypeList<>,
+                 auto f = [] {},
+                 typename Current = decltype(GetCurrentTagType<impl::AttributesTag, decltype(f)>())::Type,
+                 auto = AddTypeToTag<impl::AttributesCounterTag<Current>, O, decltype(f)>()>
+using FieldAttribute = T;
 
 export template <typename T, auto f = [] {}, bool R = (loopholes::CountValue<impl::AttributesCounterTag<T>, decltype(f)>() > 0)>
 concept HasAttributes = R;
@@ -74,9 +61,10 @@ consteval auto GetAttributes()
 export template <typename T>
 consteval auto GetAttributes() {
   constexpr auto I = loopholes::CountValue<impl::AttributesCounterTag<T>>();
-  return [](auto... is) {
-    return utempl::Tuple{typename decltype(Magic(loopholes::Getter<MetaInfoKey<is, impl::AttributesCounterTag<T>>{}>{}))::Type{}...};
-  } | kSeq<I>;
+  return
+      [](auto... is) -> Tuple<typename decltype(Magic(loopholes::Getter<MetaInfoKey<*is, impl::AttributesCounterTag<T>>{}>{}))::Type...> {
+        return {};
+      } | kSeq<I>;
 };
 
 }  // namespace utempl