remove old comment visitor

Author: vinniefalco

source/lib/ast/BitcodeIDs.hpp

@@ -59,7 +59,6 @@ enum BlockId
     BI_BASE_RECORD_BLOCK_ID,
     BI_FUNCTION_BLOCK_ID,
     BI_JAVADOC_BLOCK_ID,
-    BI_COMMENT_BLOCK_ID,
     BI_REFERENCE_BLOCK_ID,
     BI_TEMPLATE_BLOCK_ID,
     BI_TEMPLATE_SPECIALIZATION_BLOCK_ID,
@@ -81,17 +80,6 @@ enum RecordId
     FUNCTION_ACCESS,
     FUNCTION_IS_METHOD,
     JAVADOC_NODE_KIND,
-    COMMENT_KIND,
-    COMMENT_TEXT,
-    COMMENT_NAME,
-    COMMENT_DIRECTION,
-    COMMENT_PARAMNAME,
-    COMMENT_CLOSENAME,
-    COMMENT_SELFCLOSING,
-    COMMENT_EXPLICIT,
-    COMMENT_ATTRKEY,
-    COMMENT_ATTRVAL,
-    COMMENT_ARG,
     FIELD_TYPE_NAME,
     FIELD_DEFAULT_VALUE,
     MEMBER_TYPE_NAME,

source/lib/ast/BitcodeReader.cpp

@@ -226,44 +226,6 @@ getJavadoc(MemberTypeInfo* I)
 
 //------------------------------------------------
 
-template <typename T> llvm::Expected<CommentInfo*> getCommentInfo(T I) {
-    return makeError("invalid type cannot contain CommentInfo");
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(FunctionInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(NamespaceInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(RecordInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(MemberTypeInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(EnumInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(TypedefInfo* I) {
-    return &I->Description.emplace_back();
-}
-
-template<> llvm::Expected<CommentInfo*> getCommentInfo(CommentInfo* I) {
-    I->Children.emplace_back(std::make_unique<CommentInfo>());
-    return I->Children.back().get();
-}
-
-template<>
-llvm::Expected<CommentInfo*> getCommentInfo(std::unique_ptr<CommentInfo>& I) {
-    return getCommentInfo(I.get());
-}
-
 // When readSubBlock encounters a TypeInfo sub-block, it calls addTypeInfo on
 // the parent block to set it. The template specializations define what to do
 // for each supported parent block.
@@ -708,8 +670,6 @@ class BitcodeReader
         llvm::StringRef Blob, FieldTypeInfo* I);
     llvm::Error parseRecord(Record const& R, unsigned ID,
         llvm::StringRef Blob, MemberTypeInfo* I);
-    llvm::Error parseRecord(const Record& R, unsigned ID,
-        llvm::StringRef Blob, CommentInfo* I);
     llvm::Error parseRecord(const Record& R, unsigned ID,
         llvm::StringRef Blob, Reference* I, FieldId& F);
     llvm::Error parseRecord(const Record& R, unsigned ID,
@@ -786,7 +746,6 @@ getInfos()
         case BI_FIELD_TYPE_BLOCK_ID:
         case BI_MEMBER_TYPE_BLOCK_ID:
         case BI_JAVADOC_BLOCK_ID:
-        case BI_COMMENT_BLOCK_ID:
         case BI_REFERENCE_BLOCK_ID:
             return makeError("invalid top level block");
         case BI_NAMESPACE_BLOCK_ID:
@@ -954,15 +913,6 @@ readSubBlock(
         return llvm::Error::success();
     }
 
-    case BI_COMMENT_BLOCK_ID:
-    {
-        auto Comment = getCommentInfo(I);
-        if (!Comment)
-            return Comment.takeError();
-        if (auto Err = readBlock(ID, Comment.get()))
-            return Err;
-        return llvm::Error::success();
-    }
     case BI_TYPE_BLOCK_ID:
     {
         TypeInfo TI;
@@ -1341,43 +1291,6 @@ parseRecord(
     return llvm::Error::success();
 }
 
-llvm::Error
-BitcodeReader::
-parseRecord(
-    const Record& R,
-    unsigned ID,
-    llvm::StringRef Blob,
-    CommentInfo* I)
-{
-    switch (ID)
-    {
-    case COMMENT_KIND:
-        return decodeRecord(R, I->Kind, Blob);
-    case COMMENT_TEXT:
-        return decodeRecord(R, I->Text, Blob);
-    case COMMENT_NAME:
-        return decodeRecord(R, I->Name, Blob);
-    case COMMENT_DIRECTION:
-        return decodeRecord(R, I->Direction, Blob);
-    case COMMENT_PARAMNAME:
-        return decodeRecord(R, I->ParamName, Blob);
-    case COMMENT_CLOSENAME:
-        return decodeRecord(R, I->CloseName, Blob);
-    case COMMENT_ATTRKEY:
-        return decodeRecord(R, I->AttrKeys, Blob);
-    case COMMENT_ATTRVAL:
-        return decodeRecord(R, I->AttrValues, Blob);
-    case COMMENT_ARG:
-        return decodeRecord(R, I->Args, Blob);
-    case COMMENT_SELFCLOSING:
-        return decodeRecord(R, I->SelfClosing, Blob);
-    case COMMENT_EXPLICIT:
-        return decodeRecord(R, I->Explicit, Blob);
-    default:
-        return makeError("invalid field for CommentInfo");
-    }
-}
-
 llvm::Error
 BitcodeReader::
 parseRecord(

source/lib/ast/BitcodeWriter.cpp

@@ -160,7 +160,6 @@ BlockIdNameMap = []()
         {BI_BASE_RECORD_BLOCK_ID, "BaseRecordBlock"},
         {BI_FUNCTION_BLOCK_ID, "FunctionBlock"},
         {BI_JAVADOC_BLOCK_ID, "JavadocBlock"},
-        {BI_COMMENT_BLOCK_ID, "CommentBlock"},
         {BI_REFERENCE_BLOCK_ID, "ReferenceBlock"},
         {BI_TEMPLATE_BLOCK_ID, "TemplateBlock"},
         {BI_TEMPLATE_SPECIALIZATION_BLOCK_ID, "TemplateSpecializationBlock"},
@@ -184,17 +183,6 @@ RecordIdNameMap = []()
     static const std::vector<std::pair<RecordId, RecordIdDsc>> Inits = {
         {VERSION, {"Version", &IntAbbrev}},
         {JAVADOC_NODE_KIND, {"NodeKind", &IntAbbrev}},
-        {COMMENT_KIND, {"Kind", &StringAbbrev}},
-        {COMMENT_TEXT, {"Text", &StringAbbrev}},
-        {COMMENT_NAME, {"Name", &StringAbbrev}},
-        {COMMENT_DIRECTION, {"Direction", &StringAbbrev}},
-        {COMMENT_PARAMNAME, {"ParamName", &StringAbbrev}},
-        {COMMENT_CLOSENAME, {"CloseName", &StringAbbrev}},
-        {COMMENT_SELFCLOSING, {"SelfClosing", &BoolAbbrev}},
-        {COMMENT_EXPLICIT, {"Explicit", &BoolAbbrev}},
-        {COMMENT_ATTRKEY, {"AttrKey", &StringAbbrev}},
-        {COMMENT_ATTRVAL, {"AttrVal", &StringAbbrev}},
-        {COMMENT_ARG, {"Arg", &StringAbbrev}},
         {FIELD_TYPE_NAME, {"Name", &StringAbbrev}},
         {FIELD_DEFAULT_VALUE, {"DefaultValue", &StringAbbrev}},
         {MEMBER_TYPE_NAME, {"Name", &StringAbbrev}},
@@ -259,11 +247,6 @@ RecordsByBlock{
     // Javadoc Block
     {BI_JAVADOC_BLOCK_ID,
         {JAVADOC_NODE_KIND}},
-    // Comment Block
-    {BI_COMMENT_BLOCK_ID,
-        {COMMENT_KIND, COMMENT_TEXT, COMMENT_NAME, COMMENT_DIRECTION,
-        COMMENT_PARAMNAME, COMMENT_CLOSENAME, COMMENT_SELFCLOSING,
-        COMMENT_EXPLICIT, COMMENT_ATTRKEY, COMMENT_ATTRVAL, COMMENT_ARG}},
     // Type Block
     {BI_TYPE_BLOCK_ID, {}},
     // <mrdox/FieldType.hpp> Block
@@ -618,8 +601,6 @@ emitBlock(
     for (const auto& N : I.Namespace)
         emitBlock(N, FieldId::F_namespace);
     emitBlock(I.javadoc);
-    for (const auto& CI : I.Description)
-        emitBlock(CI);
     for (const auto& C : I.Children.Namespaces)
         emitBlock(C, FieldId::F_child_namespace);
     for (const auto& C : I.Children.Records)
@@ -644,8 +625,6 @@ emitBlock(
     for (const auto& N : I.Namespace)
         emitBlock(N, FieldId::F_namespace);
     emitBlock(I.javadoc);
-    for (const auto& CI : I.Description)
-        emitBlock(CI);
     if (I.DefLoc)
         emitRecord(*I.DefLoc, RECORD_DEFLOCATION);
     for (const auto& L : I.Loc)
@@ -700,8 +679,6 @@ emitBlock(
     for (const auto& N : I.Namespace)
         emitBlock(N, FieldId::F_namespace);
     emitBlock(I.javadoc);
-    for (const auto& CI : I.Description)
-        emitBlock(CI);
     emitRecord(I.Access, FUNCTION_ACCESS);
     emitRecord(I.IsMethod, FUNCTION_IS_METHOD);
     if (I.DefLoc)
@@ -751,8 +728,6 @@ emitBlock(
     for (const auto& N : T.Namespace)
         emitBlock(N, FieldId::F_namespace);
     emitBlock(T.javadoc);
-    for (const auto& CI : T.Description)
-        emitBlock(CI);
     if (T.DefLoc)
         emitRecord(*T.DefLoc, TYPEDEF_DEFLOCATION);
     emitRecord(T.IsUsing, TYPEDEF_IS_USING);
@@ -780,8 +755,6 @@ emitBlock(
     emitRecord(T.Name, MEMBER_TYPE_NAME);
     emitRecord(T.Access, MEMBER_TYPE_ACCESS);
     emitBlock(T.javadoc);
-    for (const auto& CI : T.Description)
-        emitBlock(CI);
 }
 
 void
@@ -855,35 +828,6 @@ emitBlock(List<T> const& list)
     }
 }
 
-void
-BitcodeWriter::
-emitBlock(
-    CommentInfo const& I)
-{
-    StreamSubBlockGuard Block(Stream, BI_COMMENT_BLOCK_ID);
-    for (auto const& L : std::vector<std::pair<
-        llvm::StringRef, RecordId>>{
-             {I.Kind, COMMENT_KIND},
-             {I.Text, COMMENT_TEXT},
-             {I.Name, COMMENT_NAME},
-             {I.Direction, COMMENT_DIRECTION},
-             {I.ParamName, COMMENT_PARAMNAME},
-             {I.CloseName, COMMENT_CLOSENAME} })
-    {
-        emitRecord(L.first, L.second);
-    }
-    emitRecord(I.SelfClosing, COMMENT_SELFCLOSING);
-    emitRecord(I.Explicit, COMMENT_EXPLICIT);
-    for (const auto& A : I.AttrKeys)
-        emitRecord(A, COMMENT_ATTRKEY);
-    for (const auto& A : I.AttrValues)
-        emitRecord(A, COMMENT_ATTRVAL);
-    for (const auto& A : I.Args)
-        emitRecord(A, COMMENT_ARG);
-    for (const auto& C : I.Children)
-        emitBlock(*C);
-}
-
 void
 BitcodeWriter::
 emitBlock(
@@ -895,8 +839,6 @@ emitBlock(
     for (const auto& N : I.Namespace)
         emitBlock(N, FieldId::F_namespace);
     emitBlock(I.javadoc);
-    for (const auto& CI : I.Description)
-        emitBlock(CI);
     if (I.DefLoc)
         emitRecord(*I.DefLoc, ENUM_DEFLOCATION);
     for (const auto& L : I.Loc)

source/lib/ast/BitcodeWriter.hpp

@@ -95,7 +95,6 @@ class BitcodeWriter
     void emitBlock(Javadoc const& jd);
     template<class T>
     void emitBlock(List<T> const& list);
-    void emitBlock(CommentInfo const& B);
     void emitBlock(TemplateInfo const& T);
     void emitBlock(TemplateSpecializationInfo const& T);
     void emitBlock(TemplateParamInfo const& T);