javadocs are unique pointers

Author: vinniefalco

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;
 
     //--------------------------------------------
 

source/-XML/XMLWriter.cpp

@@ -578,9 +578,9 @@ writeTemplate(
 void
 XMLWriter::
 writeJavadoc(
-    std::optional<Javadoc> const& javadoc)
+    std::unique_ptr<Javadoc> const& javadoc)
 {
-    if(! javadoc.has_value())
+    if(! javadoc)
         return;
     tags_.open(javadocTagName);
     if(auto brief = javadoc->getBrief())

source/-XML/XMLWriter.hpp

@@ -84,7 +84,7 @@ class XMLWriter
     void writeInfo(Info const&);
     void writeSymbol(SymbolInfo const& I);
     void writeLocation(Location const& loc, bool def = false);
-    void writeJavadoc(std::optional<Javadoc> const& javadoc);
+    void writeJavadoc(std::unique_ptr<Javadoc> const& javadoc);
     void writeTemplate(const TemplateInfo& I);
 
     template<class T>

source/-adoc/AdocWriter.cpp

@@ -529,10 +529,10 @@ writeNestedTypes(
 void
 AdocWriter::
 writeBrief(
-    std::optional<Javadoc> const& javadoc,
+    std::unique_ptr<Javadoc> const& javadoc,
     bool withNewline)
 {
-    if(! javadoc.has_value())
+    if(! javadoc)
         return;
     auto const node = javadoc->getBrief();
     if(! node)
@@ -547,9 +547,9 @@ writeBrief(
 void
 AdocWriter::
 writeDescription(
-    std::optional<Javadoc> const& javadoc)
+    std::unique_ptr<Javadoc> const& javadoc)
 {
-    if(! javadoc.has_value())
+    if(! javadoc)
         return;
 
     //os_ << '\n';

source/-adoc/AdocWriter.hpp

@@ -109,10 +109,10 @@ class AdocWriter
         FunctionInfo const& I);
 
     void writeBrief(
-        std::optional<Javadoc> const& javadoc,
+        std::unique_ptr<Javadoc> const& javadoc,
         bool withNewline = true);
     void writeDescription(
-        std::optional<Javadoc> const& javadoc);
+        std::unique_ptr<Javadoc> const& javadoc);
     void writeLocation(SymbolInfo const& I);
 
     template<class T>

source/AST/ASTVisitor.cpp

@@ -517,7 +517,7 @@ applyDecayToParameters(
 void
 ASTVisitor::
 parseRawComment(
-    std::optional<Javadoc>& javadoc,
+    std::unique_ptr<Javadoc>& javadoc,
     Decl const* D,
     Reporter& R)
 {
@@ -528,7 +528,8 @@ parseRawComment(
     if(RC)
     {
         RC->setAttached();
-        javadoc.emplace(parseJavadoc(RC, D, R));
+        javadoc = std::make_unique<Javadoc>(
+            parseJavadoc(RC, D, R));
     }
     else
     {

source/AST/ASTVisitor.hpp

@@ -176,7 +176,7 @@ class ASTVisitor
 
     void
     parseRawComment(
-        std::optional<Javadoc>& javadoc,
+        std::unique_ptr<Javadoc>& javadoc,
         Decl const* D,
         Reporter& R);
 

source/AST/AnyBlock.hpp

@@ -254,19 +254,19 @@ class JavadocBlock
     : public BitcodeReader::AnyBlock
 {
     BitcodeReader& br_;
-    std::optional<Javadoc>& I_;
+    std::unique_ptr<Javadoc>& I_;
     AnyNodeList* stack_ = nullptr;
     AnyNodeList J_;
 
 public:
     JavadocBlock(
-        std::optional<Javadoc>& I,
+        std::unique_ptr<Javadoc>& I,
         BitcodeReader& br) noexcept
         : br_(br)
         , I_(I)
         , J_(stack_)
     {
-        I_.emplace();
+        I_ = std::make_unique<Javadoc>();
     }
 
     llvm::Error

source/AST/BitcodeWriter.cpp

@@ -747,8 +747,7 @@ emitInfoPart(
     StreamSubBlockGuard Block(Stream, BI_INFO_PART_ID);
     emitRecord(I.id, INFO_PART_ID);
     emitRecord(I.Name, INFO_PART_NAME);
-    if(I.javadoc)
-        emitBlock(*I.javadoc);
+    emitBlock(I.javadoc);
     for (const auto& N : I.Namespace)
         emitBlock(N, FieldId::F_namespace);
 }
@@ -849,12 +848,14 @@ emitBlock(
 void
 BitcodeWriter::
 emitBlock(
-    Javadoc const& jd)
+    std::unique_ptr<Javadoc> const& jd)
 {
-    // If the optional<Javadoc> has a value then we
+    if(! jd)
+        return;
+    // If the unique_ptr<Javadoc> has a value then we
     // always want to emit it, even if it is empty.
     StreamSubBlockGuard Block(Stream, BI_JAVADOC_BLOCK_ID);
-    emitBlock(jd.getBlocks());
+    emitBlock(jd->getBlocks());
 }
 
 void

source/AST/BitcodeWriter.hpp

@@ -124,7 +124,7 @@ class BitcodeWriter
     void emitBlock(EnumValueInfo const& I);
     void emitBlock(FunctionInfo const& I);
     void emitBlock(Param const& I);
-    void emitBlock(Javadoc const& jd);
+    void emitBlock(std::unique_ptr<Javadoc> const& jd);
     void emitBlock(Javadoc::Node const& I);
     void emitBlock(NamespaceInfo const& I);
     void emitBlock(RecordInfo const& I);