javadoc bitcode

Author: vinniefalco

include/mrdox/meta/Javadoc.hpp

@@ -72,11 +72,12 @@ struct Javadoc
 {
     using String = std::string;
 
-    enum class Kind
+    enum class Kind : int
     {
         text,
         styledText,
         paragraph,
+        brief,
         admonition,
         code,
         returns,
@@ -191,7 +192,7 @@ struct Javadoc
 
         auto operator<=>(Paragraph const&) const noexcept = default;
 
-        Paragraph()
+        Paragraph() noexcept
             : Block(Kind::paragraph)
         {
         }
@@ -204,6 +205,18 @@ struct Javadoc
         }
     };
 
+    /** The brief description
+    */
+    struct Brief : Paragraph
+    {
+        auto operator<=>(Brief const&) const noexcept = default;
+
+        Brief() noexcept
+            : Paragraph(Kind::brief)
+        {
+        }
+    };
+
     /** Documentation for an admonition
     */
     struct Admonition : Paragraph
@@ -291,11 +304,8 @@ struct Javadoc
 
     //---
 
-    std::shared_ptr<Paragraph> const&
-    getBrief() const noexcept
-    {
-        return brief_;
-    }
+    Paragraph const*
+    getBrief() const noexcept;
 
     List<Block> const&
     getBlocks() const noexcept
@@ -323,12 +333,11 @@ struct Javadoc
 
     //---
 
-    Javadoc() = default;
+    Javadoc() noexcept;
 
     /** Constructor
     */
     Javadoc(
-        Paragraph brief,
         List<Block> blocks,
         List<Param> params,
         List<TParam> tparams,
@@ -360,8 +369,12 @@ struct Javadoc
         tparams_.emplace_back(std::move(tparam));
     }
 
+    void merge(Javadoc& other);
+
 private:
-    std::shared_ptr<Paragraph> brief_;
+    static Paragraph const s_empty_;
+
+    Paragraph const* brief_;
     List<Block> blocks_;
     List<Param> params_;
     List<TParam> tparams_;

include/mrdox/meta/List.hpp

@@ -83,6 +83,9 @@ class List
     template<class U>
     iterator emplace_back(U&& u);
 
+    template<class U>
+    void splice_back(List<U>& other);
+
     void swap(List& other);
 
 private:
@@ -498,6 +501,30 @@ emplace_back(U&& u) ->
     return iterator(item);
 }
 
+template<class T>
+template<class U>
+void
+List<T>::
+splice_back(
+    List<U>& other)
+{
+    if(other.empty())
+        return;
+    auto it = other.head_;
+    while(it != &other.end_)
+    {
+        auto next = it->next;
+        append(it);
+        it = next;
+    }
+    size_ += other.size_;
+    other.size_ = 0;
+    other.head_ = &other.end_;
+    other.tail_ = &other.end_;
+    tail_ = &end_;
+}
+
+
 template<class T>
 void
 List<T>::

source/lib/Corpus.cpp

@@ -11,7 +11,7 @@
 
 #include "ast/FrontendAction.hpp"
 #include "ast/BitcodeReader.hpp"
-#include "ast/BitcodeWriter.hpp"
+//#include "ast/BitcodeWriter.hpp"
 #include "ast/Serialize.hpp"
 #include "meta/Reduce.hpp"
 #include <mrdox/Corpus.hpp>
@@ -121,8 +121,7 @@ build(
             for (auto& Bitcode : Group.getValue())
             {
                 llvm::BitstreamCursor Stream(Bitcode);
-                ClangDocBitcodeReader Reader(Stream);
-                auto infos = Reader.readBitcode();
+                auto infos = readBitcode(Stream, R);
                 if(R.error(infos, "read bitcode"))
                 {
                     GotFailure = true;