bitcode work

Author: vinniefalco

include/mrdox/meta/Javadoc.hpp

@@ -29,31 +29,33 @@ struct Javadoc
 
     enum class Kind : int
     {
-        text,
-        styledText,
+        text = 1, // needed by bitstream
+        styled,
+        block, // used by bitcodes
         paragraph,
         brief,
         admonition,
         code,
-        returns,
         param,
-        tparam
+        tparam,
+        returns
     };
 
     /** A text style.
     */
-    enum class Style
+    enum class Style : int
     {
-        none,
+        none = 1, // needed by bitstream
         mono,
         bold,
         italic
     };
 
     /** An admonishment style.
     */
-    enum class Admonish
+    enum class Admonish : int
     {
+        none = 1, // needed by bitstream
         note,
         tip,
         important,
@@ -85,7 +87,7 @@ struct Javadoc
 
         explicit
         Text(
-            String text_)
+            String text_ = String())
             : Node(Kind::text)
             , text(std::move(text_))
         {
@@ -110,9 +112,9 @@ struct Javadoc
         auto operator<=>(StyledText const&) const noexcept = default;
 
         StyledText(
-            String text,
-            Style style_)
-            : Text(std::move(text), Kind::styledText)
+            String text = String(),
+            Style style_ = Style::none)
+            : Text(std::move(text), Kind::styled)
             , style(style_)
         {
         }
@@ -181,7 +183,8 @@ struct Javadoc
         auto operator<=>(Admonition const&) const noexcept = default;
 
         explicit
-        Admonition(Admonish style_)
+        Admonition(
+            Admonish style_ = Admonish::none)
             : Paragraph(Kind::admonition)
             , style(style_)
         {
@@ -203,18 +206,6 @@ struct Javadoc
         }
     };
 
-    /** Documentation for a function return type
-    */
-    struct Returns : Paragraph
-    {
-        auto operator<=>(Returns const&) const noexcept = default;
-
-        Returns()
-            : Paragraph(Kind::returns)
-        {
-        }
-    };
-
     /** Documentation for a function parameter
     */
     struct Param : Block
@@ -225,8 +216,8 @@ struct Javadoc
         auto operator<=>(Param const&) const noexcept = default;
 
         Param(
-            String name_,
-            Paragraph details_)
+            String name_ = String(),
+            Paragraph details_ = Paragraph())
             : Block(Kind::param)
             , name(std::move(name_))
             , details(std::move(details_))
@@ -244,15 +235,27 @@ struct Javadoc
         auto operator<=>(TParam const&) const noexcept = default;
 
         TParam(
-            String name_,
-            Paragraph details_)
+            String name_ = String(),
+            Paragraph details_ = Paragraph())
             : Block(Kind::param)
             , name(std::move(name_))
             , details(std::move(details_))
         {
         }
     };
 
+    /** Documentation for a function return type
+    */
+    struct Returns : Paragraph
+    {
+        auto operator<=>(Returns const&) const noexcept = default;
+
+        Returns()
+            : Paragraph(Kind::returns)
+        {
+        }
+    };
+
     // VFALCO LEGACY
     llvm::SmallString<32> brief;
     std::string desc;
@@ -326,6 +329,8 @@ struct Javadoc
 
     void merge(Javadoc& other);
 
+bool dummy = false;
+
 private:
     static Paragraph const s_empty_;
 

include/mrdox/meta/List.hpp

@@ -81,7 +81,7 @@ class List
     bool erase_first_of_if(Pred&& pred) noexcept;
 
     template<class U>
-    iterator emplace_back(U&& u);
+    U& emplace_back(U&& u);
 
     template<class U>
     void splice_back(List<U>& other);
@@ -210,7 +210,6 @@ struct List<T>::Item : Node
         return new Item(next, u_);
     }
 
-private:
     U u_;
 };
 
@@ -492,13 +491,13 @@ template<class U>
 auto
 List<T>::
 emplace_back(U&& u) ->
-    iterator
+    U&
 {
     static_assert(std::is_convertible_v<U*, T*>);
 
     auto item = new Item<U>(&end_, std::forward<U>(u));
     append(item);
-    return iterator(item);
+    return item->u_;
 }
 
 template<class T>

source/lib/ast/BitcodeIDs.hpp

@@ -36,7 +36,6 @@ struct BitCodeConstants
     static constexpr unsigned USRLengthSize = 6U;
     static constexpr unsigned USRBitLengthSize = 8U;
     static constexpr unsigned USRHashSize = 20;
-    static constexpr unsigned JavadocKindSize = 1U;
     static constexpr unsigned char Signature[4] = {'D', 'O', 'C', 'S'};
 };
 
@@ -59,6 +58,8 @@ enum BlockId
     BI_BASE_RECORD_BLOCK_ID,
     BI_FUNCTION_BLOCK_ID,
     BI_JAVADOC_BLOCK_ID,
+    BI_JAVADOC_LIST_BLOCK_ID,
+    BI_JAVADOC_NODE_BLOCK_ID,
     BI_REFERENCE_BLOCK_ID,
     BI_TEMPLATE_BLOCK_ID,
     BI_TEMPLATE_SPECIALIZATION_BLOCK_ID,
@@ -79,7 +80,12 @@ enum RecordId
     FUNCTION_LOCATION,
     FUNCTION_ACCESS,
     FUNCTION_IS_METHOD,
+    JAVADOC_DUMMY,
+    JAVADOC_LIST_KIND,
     JAVADOC_NODE_KIND,
+    JAVADOC_NODE_STRING,
+    JAVADOC_NODE_STYLE,
+    JAVADOC_NODE_ADMONISH,
     FIELD_TYPE_NAME,
     FIELD_DEFAULT_VALUE,
     MEMBER_TYPE_NAME,