tidy up merge

Author: vinniefalco

include/mrdox/Metadata/Function.hpp

@@ -121,8 +121,6 @@ struct FunctionInfo : SymbolInfo
         : SymbolInfo(InfoType::IT_function, id_)
     {
     }
-
-    void merge(FunctionInfo&& I);
 };
 
 //------------------------------------------------

include/mrdox/Metadata/Javadoc.hpp

@@ -343,14 +343,6 @@ struct Javadoc
     bool operator!=(Javadoc const&) const noexcept;
     /* @} */
 
-    /** Merge other into this.
-
-        This is used to combine separate doc
-        comments which are semantically attached
-        to the same symbol.
-    */
-    void merge(Javadoc&& other);
-
     List<Block>::const_iterator
     findBrief() const noexcept;
 

include/mrdox/Metadata/Namespace.hpp

@@ -33,8 +33,6 @@ struct NamespaceInfo
     NamespaceInfo(
         SymbolID id,
         llvm::StringRef Name = llvm::StringRef());
-
-    void merge(NamespaceInfo&& I);
 };
 
 } // mrdox

include/mrdox/Metadata/Record.hpp

@@ -78,8 +78,6 @@ struct RecordInfo : SymbolInfo
     RecordInfo(
         SymbolID id = SymbolID(),
         llvm::StringRef Name = llvm::StringRef());
-
-    void merge(RecordInfo&& I);
 };
 
 } // mrdox

include/mrdox/Metadata/Symbol.hpp

@@ -38,8 +38,6 @@ struct SymbolInfo : Info
         : Info(IT, id_, Name)
     {
     }
-
-    void merge(SymbolInfo&& I);
 };
 
 } // mrdox

include/mrdox/Metadata/Typedef.hpp

@@ -39,8 +39,6 @@ struct TypedefInfo : SymbolInfo
         : SymbolInfo(InfoType::IT_typedef, id_)
     {
     }
-
-    void merge(TypedefInfo&& I);
 };
 
 } // mrdox

include/mrdox/Metadata/Variable.hpp

@@ -38,8 +38,6 @@ struct VariableInfo : SymbolInfo
         : SymbolInfo(InfoType::IT_variable, ID, Name)
     {
     }
-
-    void merge(TypedefInfo&& I);
 };
 
 } // mrdox

source/api/Metadata/Javadoc.cpp

@@ -68,18 +68,6 @@ operator!=(
     return !(*this == other);
 }
 
-void
-Javadoc::
-merge(Javadoc&& other)
-{
-    // Unconditionally extend the blocks
-    // since each decl may have a comment.
-    if(other != *this)
-    {
-        append(blocks_, std::move(other.blocks_));
-    }
-}
-
 auto
 Javadoc::
 findBrief() const noexcept ->

source/api/Metadata/Reduce.cpp

@@ -29,6 +29,16 @@ static bool canMerge(Reference const& I, Reference const& Other)
         I.id == Other.id;
 }
 
+static void merge(Javadoc& I, Javadoc&& other)
+{
+    // Unconditionally extend the blocks
+    // since each decl may have a comment.
+    if(other != I)
+    {
+        I.append(I.getBlocks(), std::move(other.getBlocks()));
+    }
+}
+
 void mergeInfo(Info& I, Info&& Other)
 {
     Assert(canMerge(I, Other));
@@ -43,7 +53,7 @@ void mergeInfo(Info& I, Info&& Other)
     if(! I.javadoc)
         I.javadoc = std::move(Other.javadoc);
     else if(Other.javadoc)
-        I.javadoc->merge(std::move(*Other.javadoc));
+        merge(*I.javadoc, std::move(*Other.javadoc));
 }
 
 static void mergeSymbolInfo(SymbolInfo& I, SymbolInfo&& Other)

source/api/Metadata/Reduce.hpp

@@ -21,13 +21,13 @@
 namespace clang {
 namespace mrdox {
 
-void merge(Reference& I, Reference&& Other);
 void merge(NamespaceInfo& I, NamespaceInfo&& Other);
 void merge(RecordInfo& I, RecordInfo&& Other);
 void merge(FunctionInfo& I, FunctionInfo&& Other);
 void merge(TypedefInfo& I, TypedefInfo&& Other);
 void merge(EnumInfo& I, EnumInfo&& Other);
 void merge(VariableInfo& I, VariableInfo&& Other);
+void merge(Reference& I, Reference&& Other);
 
 //
 // This file defines the merging of different types of infos. The data in the