unify traverse functions

#refactor
cppalliance · Dec 17, 2024 · 938b673 · 938b673
1 parent 1579517
commit 938b673
Show file tree

Hide file tree

Showing 12 changed files with 459 additions and 469 deletions.
diff --git a/include/mrdocs/Metadata/Concept.hpp b/include/mrdocs/Metadata/Concept.hpp
@@ -28,7 +28,7 @@ struct ConceptInfo
 {
     /** The concepts template parameters
     */
-    std::unique_ptr<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     /** The concepts constraint-expression
     */

diff --git a/include/mrdocs/Metadata/Function.hpp b/include/mrdocs/Metadata/Function.hpp
@@ -126,13 +126,16 @@ struct FunctionInfo
     : InfoCommonBase<InfoKind::Function>
     , SourceInfo
 {
-    std::unique_ptr<TypeInfo> ReturnType; // Info about the return type of this function.
-    std::vector<Param> Params; // List of parameters.
+    /// Info about the return type of this function.
+    std::unique_ptr<TypeInfo> ReturnType;
 
-    // When present, this function is a template or specialization.
-    std::unique_ptr<TemplateInfo> Template;
+    /// List of parameters.
+    std::vector<Param> Params;
 
-    // the class of function this is
+    /// When present, this function is a template or specialization.
+    std::optional<TemplateInfo> Template;
+
+    /// The class of function this is
     FunctionClass Class = FunctionClass::Normal;
 
     NoexceptInfo Noexcept;

diff --git a/include/mrdocs/Metadata/Guide.hpp b/include/mrdocs/Metadata/Guide.hpp
@@ -38,7 +38,7 @@ struct GuideInfo
 
     /** Template head, if any.
     */
-    std::unique_ptr<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     /** The parameters of the deduction guide.
     */

diff --git a/include/mrdocs/Metadata/Record.hpp b/include/mrdocs/Metadata/Record.hpp
@@ -85,11 +85,11 @@ struct RecordInfo
     */
     RecordKeyKind KeyKind = RecordKeyKind::Struct;
 
-    // When present, this record is a template or specialization.
-    std::unique_ptr<TemplateInfo> Template;
+    /// When present, this record is a template or specialization.
+    std::optional<TemplateInfo> Template;
 
-    // Indicates if the record was declared using a typedef. Things like anonymous
-    // structs in a typedef:
+    // Indicates if the record was declared using a typedef.
+    // Things like anonymous structs in a typedef:
     //   typedef struct { ... } foo_t;
     // are converted into records with the typedef as the Name + this flag set.
     // KRYSTIAN FIXME: this does not account for alias-declarations

diff --git a/include/mrdocs/Metadata/Template.hpp b/include/mrdocs/Metadata/Template.hpp
@@ -369,9 +369,14 @@ struct TemplateInfo
     TemplateSpecKind specializationKind() const noexcept
     {
         if(Params.empty())
+        {
             return TemplateSpecKind::Explicit;
-        return Args.empty() ? TemplateSpecKind::Primary :
-            TemplateSpecKind::Partial;
+        }
+        if (Args.empty())
+        {
+            return TemplateSpecKind::Primary;
+        }
+        return TemplateSpecKind::Partial;
     }
 };
 
@@ -388,7 +393,7 @@ void
 tag_invoke(
     dom::ValueFromTag,
     dom::Value& v,
-    std::unique_ptr<TemplateInfo> const& I,
+    std::optional<TemplateInfo> const& I,
     DomCorpus const* domCorpus)
 {
     if (!I)

diff --git a/include/mrdocs/Metadata/Typedef.hpp b/include/mrdocs/Metadata/Typedef.hpp
@@ -35,7 +35,7 @@ struct TypedefInfo
     //   typedef std::vector<int> MyVector;
     bool IsUsing = false;
 
-    std::unique_ptr<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     //--------------------------------------------
 

diff --git a/include/mrdocs/Metadata/Variable.hpp b/include/mrdocs/Metadata/Variable.hpp
@@ -34,7 +34,7 @@ struct VariableInfo
     /** The type of the variable */
     std::unique_ptr<TypeInfo> Type;
 
-    std::unique_ptr<TemplateInfo> Template;
+    std::optional<TemplateInfo> Template;
 
     ExprInfo Initializer;