unify logic to populate attributes

#refactor
cppalliance · Jan 13, 2025 · 6c6ffc9 · 6c6ffc9
1 parent 1e1012a
commit 6c6ffc9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
@@ -1112,17 +1112,7 @@ populate(
         populate(I.Requires, TRC);
     }
 
-    if (D->hasAttrs())
-    {
-        for (AttrVec& attrs = D->getAttrs();
-             Attr const* attr: attrs)
-        {
-            if (IdentifierInfo const* II = attr->getAttrName())
-            {
-                I.Attributes.emplace_back(II->getName());
-            }
-        }
-    }
+    populateAttributes(I, D);
 }
 
 void
@@ -1234,14 +1224,7 @@ populate(
     I.HasNoUniqueAddress = D->hasAttr<NoUniqueAddressAttr>();
     I.IsDeprecated = D->hasAttr<DeprecatedAttr>();
     I.IsMaybeUnused = D->hasAttr<UnusedAttr>();
-    if (D->hasAttrs())
-    {
-        for (AttrVec& attrs = D->getAttrs();
-             Attr const* attr: attrs)
-        {
-            I.Attributes.emplace_back(attr->getAttrName()->getName());
-        }
-    }
+    populateAttributes(I, D);
 }
 
 void
@@ -1673,6 +1656,29 @@ populate(
         }));
 }
 
+template <std::derived_from<Info> InfoTy>
+void
+ASTVisitor::
+populateAttributes(InfoTy& I, const Decl* D)
+{
+    if constexpr (requires { I.Attributes; })
+    {
+        MRDOCS_CHECK_OR(D->hasAttrs());
+        for (Attr const* attr: D->getAttrs())
+        {
+            IdentifierInfo const* II = attr->getAttrName();
+            if (!II)
+            {
+                continue;
+            }
+            if (std::ranges::find(I.Attributes, II->getName()) == I.Attributes.end())
+            {
+                I.Attributes.emplace_back(II->getName());
+            }
+        }
+    }
+}
+
 std::string
 ASTVisitor::
 extractName(NamedDecl const* D)

diff --git a/src/lib/AST/ASTVisitor.hpp b/src/lib/AST/ASTVisitor.hpp
@@ -560,6 +560,11 @@ class ASTVisitor
         std::vector<std::unique_ptr<TArg>>& result,
         const ASTTemplateArgumentListInfo* args);
 
+    template <std::derived_from<Info> InfoTy>
+    static
+    void
+    populateAttributes(InfoTy& I, const Decl* D);
+
     // =================================================
     // Populate function helpers
     // =================================================