chore: remove OptionalSymbolID

Author: sdkrystian

include/mrdocs/Metadata/Symbols.hpp

@@ -32,10 +32,7 @@ namespace mrdocs {
 class SymbolID
 {
 public:
-    static const SymbolID zero;
-
     static const SymbolID invalid;
-
     static const SymbolID global;
 
     using value_type = std::uint8_t;
@@ -54,11 +51,6 @@ class SymbolID
         return *this != SymbolID::invalid;
     }
 
-    constexpr bool empty() const noexcept
-    {
-        return *this == zero;
-    }
-
     constexpr auto data() const noexcept
     {
         return data_;
@@ -101,9 +93,6 @@ class SymbolID
     value_type data_[20];
 };
 
-
-constexpr inline SymbolID SymbolID::zero = SymbolID();
-
 /** The invalid Symbol ID.
 */
 // KRYSTIAN NOTE: msvc requires inline as it doesn't consider this
@@ -116,10 +105,6 @@ constexpr inline SymbolID SymbolID::global =
     "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
     "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";
 
-/** Like std::optional<SymbolID>
-*/
-using OptionalSymbolID = Optional<SymbolID>;
-
 /** Return the result of comparing s0 to s1.
 
     This function returns true if the string

include/mrdocs/Metadata/Template.hpp

@@ -286,7 +286,7 @@ struct TemplateInfo
 
     /** Primary template ID for partial and explicit specializations.
     */
-    OptionalSymbolID Primary;
+    SymbolID Primary = SymbolID::invalid;
 
     // KRYSTIAN NOTE: using the presence of args/params
     // to determine the specialization kind *should* work.

src/lib/-XML/XMLWriter.cpp

@@ -481,13 +481,10 @@ openTemplate(
     if(! I)
         return;
 
-    const SymbolID& id = I->Primary ?
-        *I->Primary : SymbolID::invalid;
-
     tags_.open(templateTagName, {
         {"class", toString(I->specializationKind()),
             I->specializationKind() != TemplateSpecKind::Primary},
-        {id}
+        {I->Primary}
     });
 
     for(const auto& tparam : I->Params)

src/lib/AST/ASTVisitor.cpp

@@ -1435,7 +1435,7 @@ class ASTVisitor
         ClassTemplateSpecializationDecl* spec)
     {
         if(Decl* primary = getInstantiatedFrom(spec->getSpecializedTemplate()))
-            extractSymbolID(primary, I.Primary.emplace());
+            extractSymbolID(primary, I.Primary);
         // KRYSTIAN NOTE: when this is a partial specialization, we could use
         // ClassTemplatePartialSpecializationDecl::getTemplateArgsAsWritten
         const TypeSourceInfo* type_written = spec->getTypeAsWritten();
@@ -1458,7 +1458,7 @@ class ASTVisitor
         // the USR of the templated VarDecl seems to be the correct one.
         if(auto* primary = dyn_cast<VarTemplateDecl>(
             getInstantiatedFrom(spec->getSpecializedTemplate())))
-            extractSymbolID(primary->getTemplatedDecl(), I.Primary.emplace());
+            extractSymbolID(primary->getTemplatedDecl(), I.Primary);
         const ASTTemplateArgumentListInfo* args_written = nullptr;
         // getTemplateArgsInfo returns nullptr for partial specializations,
         // so we use getTemplateArgsAsWritten if this is a partial specialization
@@ -1480,7 +1480,7 @@ class ASTVisitor
     {
         // KRYSTIAN NOTE: do we need to check I->Primary.has_value()?
         if(Decl* primary = getInstantiatedFrom(spec->getTemplate()))
-            extractSymbolID(primary, I.Primary.emplace());
+            extractSymbolID(primary, I.Primary);
         // TemplateArguments is used instead of TemplateArgumentsAsWritten
         // because explicit specializations of function templates may have
         // template arguments deduced from their return type and parameters
@@ -1498,7 +1498,7 @@ class ASTVisitor
             candidates.size() == 1)
         {
             if(Decl* primary = getInstantiatedFrom(candidates.front()))
-                extractSymbolID(primary, I.Primary.emplace());
+                extractSymbolID(primary, I.Primary);
         }
 
         if(auto* args_written = spec->TemplateArgumentsAsWritten)
@@ -1801,7 +1801,7 @@ class ASTVisitor
             switch(parent_context->getDeclKind())
             {
             // the TranslationUnit DeclContext is the global namespace;
-            // it uses SymbolID::zero and should *always* exist
+            // it uses SymbolID::global and should *always* exist
             case Decl::TranslationUnit:
             {
                 parent_id = SymbolID::global;

src/lib/AST/AnyBlock.hpp

@@ -1118,7 +1118,7 @@ class TemplateBlock
         switch(ID)
         {
         case TEMPLATE_PRIMARY_USR:
-            return decodeRecord(R, I_.Primary.emplace(), Blob);
+            return decodeRecord(R, I_.Primary, Blob);
         default:
             return AnyBlock::parseRecord(R, ID, Blob);
         }

src/lib/AST/BitcodeWriter.cpp

@@ -1038,8 +1038,7 @@ emitBlock(
     const TemplateInfo& T)
 {
     StreamSubBlockGuard Block(Stream, BI_TEMPLATE_BLOCK_ID);
-    if(T.Primary)
-        emitRecord(*T.Primary, TEMPLATE_PRIMARY_USR);
+    emitRecord(T.Primary, TEMPLATE_PRIMARY_USR);
     for(const auto& targ : T.Args)
         emitBlock(targ);
     for(const auto& tparam : T.Params)

src/lib/Metadata/DomMetadata.cpp

@@ -349,7 +349,7 @@ domCreate(
         return nullptr;
     return dom::Object({
         { "kind", toString(I->specializationKind()) },
-        { "primary", domCorpus.get(*I->Primary) },
+        { "primary", domCorpus.get(I->Primary) },
         { "params", dom::newArray<DomTParamArray>( I->Params, domCorpus) },
         { "args", dom::newArray<DomTArgArray>(I->Args, domCorpus) }
         });

src/lib/Support/Debug.cpp

@@ -45,15 +45,6 @@ format(
     return fmt::formatter<std::string>::format(std::move(str), ctx);
 }
 
-fmt::format_context::iterator
-fmt::formatter<clang::mrdocs::OptionalSymbolID>::
-format(
-    const clang::mrdocs::OptionalSymbolID& s,
-    fmt::format_context& ctx) const
-{
-    return fmt::formatter<clang::mrdocs::SymbolID>::format(*s, ctx);
-}
-
 fmt::format_context::iterator
 fmt::formatter<clang::mrdocs::InfoKind>::
 format(

src/lib/Support/Debug.hpp

@@ -31,15 +31,6 @@ struct fmt::formatter<clang::mrdocs::SymbolID>
         fmt::format_context& ctx) const;
 };
 
-template<>
-struct fmt::formatter<clang::mrdocs::OptionalSymbolID>
-    : fmt::formatter<clang::mrdocs::SymbolID>
-{
-    fmt::format_context::iterator format(
-        const clang::mrdocs::OptionalSymbolID& s,
-        fmt::format_context& ctx) const;
-};
-
 template<>
 struct fmt::formatter<clang::mrdocs::InfoKind>
     : fmt::formatter<std::string>