include/mrdox/ADT/Optional.hpp

@@ -13,6 +13,7 @@
 #define MRDOX_ADT_OPTIONAL_HPP
 
 #include <mrdox/Platform.hpp>
+#include <concepts>
 #include <type_traits>
 #include <utility>
 
@@ -27,9 +28,11 @@ namespace mrdox {
 struct DefaultEmptyPredicate
 {
     template<class T>
-    requires
-        requires(T t) { t.empty(); }
     constexpr bool operator()(T const& t) const noexcept
+        requires requires
+        {
+            { t.empty() } -> std::convertible_to<bool>;
+        }
     {
         return t.empty();
     }
@@ -73,6 +76,26 @@ class Optional
         return t_ = T(std::forward<Args>(args)...);
     }
 
+    constexpr value_type& value() & noexcept
+    {
+        return t_;
+    }
+
+    constexpr const value_type& value() const & noexcept
+    {
+        return t_;
+    }
+
+    constexpr value_type&& value() && noexcept
+    {
+        return std::move(t_);
+    }
+
+    constexpr const value_type&& value() const && noexcept
+    {
+        return std::move(t_);
+    }
+
     constexpr value_type& operator*() noexcept
     {
         return t_;
@@ -83,6 +106,16 @@ class Optional
         return t_;
     }
 
+    constexpr value_type* operator->() noexcept
+    {
+        return &t_;
+    }
+
+    constexpr value_type const* operator->() const noexcept
+    {
+        return &t_;
+    }
+
     constexpr explicit operator bool() const noexcept
     {
         return has_value();

include/mrdox/Metadata.hpp

@@ -32,7 +32,6 @@
 #include <mrdox/Metadata/Symbol.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Template.hpp>
-#include <mrdox/Metadata/TemplateParam.hpp>
 #include <mrdox/Metadata/Type.hpp>
 #include <mrdox/Metadata/Typedef.hpp>
 #include <mrdox/Metadata/Var.hpp>

include/mrdox/Metadata/Function.hpp

@@ -21,11 +21,9 @@
 #include <mrdox/Metadata/Symbol.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
 #include <mrdox/Metadata/Template.hpp>
-#include <clang/Basic/Specifiers.h>
-#include <llvm/ADT/SmallString.h>
-#include <llvm/ADT/SmallVector.h>
 #include <clang/AST/Attr.h>
-#include <optional>
+#include <memory>
+#include <string>
 #include <vector>
 
 namespace clang {
@@ -107,11 +105,13 @@ struct Param
 struct FunctionInfo
     : SymbolInfo
 {
+    friend class ASTVisitor;
+
     TypeInfo ReturnType;   // Info about the return type of this function.
     std::vector<Param> Params; // List of parameters.
 
     // When present, this function is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    std::unique_ptr<TemplateInfo> Template;
 
     FnFlags0 specs0{.raw{0}};
     FnFlags1 specs1{.raw{0}};
@@ -126,6 +126,15 @@ struct FunctionInfo
         : SymbolInfo(InfoType::IT_function, id_)
     {
     }
+
+private:
+    explicit
+    FunctionInfo(
+        std::unique_ptr<TemplateInfo>&& T)
+        : SymbolInfo(InfoType::IT_function)
+        , Template(std::move(T))
+    {
+    }
 };
 
 //------------------------------------------------

include/mrdox/Metadata/Info.hpp

@@ -19,7 +19,7 @@
 #include <llvm/ADT/StringRef.h>
 #include <llvm/ADT/SmallVector.h>
 #include <array>
-#include <optional>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -48,7 +48,7 @@ struct Info
 
     /** The extracted javadoc for this declaration.
     */
-    std::optional<Javadoc> javadoc;
+    std::unique_ptr<Javadoc> javadoc;
 
     //--------------------------------------------
 

include/mrdox/Metadata/Record.hpp

@@ -19,11 +19,11 @@
 #include <mrdox/Metadata/Reference.hpp>
 #include <mrdox/Metadata/Scope.hpp>
 #include <mrdox/Metadata/Symbol.hpp>
-#include <mrdox/Metadata/Template.hpp>
 #include <mrdox/Metadata/Symbols.hpp>
+#include <mrdox/Metadata/Template.hpp>
 #include <clang/AST/Type.h>
 #include <llvm/ADT/SmallVector.h>
-#include <optional>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -80,12 +80,14 @@ struct RecordScope
 struct RecordInfo
     : SymbolInfo
 {
+    friend class ASTVisitor;
+
     // VFALCO Use our own enumeration for this
     // Type of this record (struct, class, union, interface).
     TagTypeKind TagType = TagTypeKind::TTK_Struct;
 
     // When present, this record is a template or specialization.
-    std::optional<TemplateInfo> Template;
+    std::unique_ptr<TemplateInfo> Template;
 
     // Indicates if the record was declared using a typedef. Things like anonymous
     // structs in a typedef:
@@ -102,7 +104,7 @@ struct RecordInfo
 
     /** List of friend functions.
     */
-    llvm::SmallVector<SymbolID, 4> Friends;
+    std::vector<SymbolID> Friends;
 
     /** Record members
     */
@@ -119,6 +121,15 @@ struct RecordInfo
         : SymbolInfo(InfoType::IT_record, id, Name)
     {
     }
+
+private:
+    explicit
+    RecordInfo(
+        std::unique_ptr<TemplateInfo>&& T)
+        : SymbolInfo(InfoType::IT_record)
+        , Template(std::move(T))
+    {
+    }
 };
 
 } // mrdox

include/mrdox/Metadata/Symbol.hpp

@@ -16,7 +16,6 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/Metadata/Info.hpp>
 #include <mrdox/Metadata/Location.hpp>
-#include <llvm/ADT/SmallVector.h>
 #include <optional>
 
 namespace clang {