tidy

Author: vinniefalco

CMakeLists.txt

@@ -236,9 +236,12 @@ if (BUILD_TESTING)
             message(FATAL_ERROR "Java is needed to run xml-lint")
         endif()
 
-        add_custom_target(mrdox.rng ALL DEPENDS mrdox.rnc
-                         COMMAND ${Java_JAVA_EXECUTABLE} -jar ${CMAKE_CURRENT_SOURCE_DIR}/tools/trang.jar
-                ${CMAKE_CURRENT_SOURCE_DIR}/mrdox.rnc ${CMAKE_CURRENT_BINARY_DIR}/mrdox.rng)
+        add_custom_target(
+            mrdox.rng ALL
+            DEPENDS mrdox.rnc
+            COMMAND ${Java_JAVA_EXECUTABLE} -jar ${CMAKE_CURRENT_SOURCE_DIR}/tools/trang.jar
+                ${CMAKE_CURRENT_SOURCE_DIR}/mrdox.rnc ${CMAKE_CURRENT_BINARY_DIR}/mrdox.rng
+            SOURCES mrdox.rnc)
 
 
         file(GLOB_RECURSE XML_SOURCES CONFIGURE_DEPENDS test-files/*.xml)

mrdox.rnc

@@ -44,6 +44,7 @@ grammar
     RecordContent =
     (
         Name,
+        Access ?,
         ID,
         Location *,
         (
@@ -61,7 +62,7 @@ grammar
         element base
         {
             Name,
-            Access,
+            Access ?,
             attribute class { "virtual" } ?,
             ID
         }
@@ -72,7 +73,7 @@ grammar
             Name,
             attribute type { text },
             attribute value { text } ?,
-            Access,
+            Access ?,
             ID ?,
             Attr *
         }
@@ -167,7 +168,11 @@ grammar
             element symbol { Symbol }
         } *
 
-    TemplateParamInfo = element tparam { attribute decl { text } }
+    TemplateParamInfo =
+        element tparam
+        {
+            attribute decl { text }
+        }
 
     Location =
         element file

source/lib/api/AST/ASTVisitor.cpp

@@ -786,11 +786,6 @@ constructFunction(
     //
     if constexpr(std::derived_from<DeclTy, CXXMethodDecl>)
     {
-        NamedDecl const* PD = nullptr;
-        if(auto const* SD = dyn_cast<ClassTemplateSpecializationDecl>(D->getParent()))
-            PD = SD->getSpecializedTemplate();
-        else
-            PD = D->getParent();
         I.specs0.isVirtual = D->isVirtual();
         I.specs0.isVirtualAsWritten = D->isVirtualAsWritten();
         I.specs0.isPure = D->isPure();

source/lib/api/AST/AnyBlock.hpp

@@ -56,18 +56,9 @@ struct BitcodeReader::AnyBlock
 class VersionBlock
     : public BitcodeReader::AnyBlock
 {
-    BitcodeReader& br_;
-
 public:
     unsigned V;
 
-    explicit
-    VersionBlock(
-        BitcodeReader& br) noexcept
-        : br_(br)
-    {
-    }
-
     llvm::Error
     parseRecord(Record const& R,
         unsigned ID, llvm::StringRef Blob) override
@@ -568,16 +559,13 @@ class MemberTypeBlock
 class BaseBlock
     : public BitcodeReader::AnyBlock
 {
-    BitcodeReader& br_;
     std::vector<BaseInfo>& v_;
 
 public:
     explicit
     BaseBlock(
-        std::vector<BaseInfo>& v,
-        BitcodeReader& br) noexcept
-        : br_(br)
-        , v_(v)
+        std::vector<BaseInfo>& v) noexcept
+        : v_(v)
     {
         v_.emplace_back();
     }
@@ -885,7 +873,7 @@ class RecordBlock
         }
         case BI_BASE_BLOCK_ID:
         {
-            BaseBlock B(I->Bases, br_);
+            BaseBlock B(I->Bases);
             return br_.readBlock(B, ID);
         }
         case BI_TEMPLATE_BLOCK_ID:
@@ -1031,15 +1019,12 @@ class TypedefBlock
 
 class EnumValueBlock : public BitcodeReader::AnyBlock
 {
-    BitcodeReader& br_;
     EnumValueInfo& I_;
 
 public:
     EnumValueBlock(
-        EnumValueInfo& I,
-        BitcodeReader& br) noexcept
-        : br_(br)
-        , I_(I)
+        EnumValueInfo& I) noexcept
+        : I_(I)
     {
     }
 
@@ -1101,7 +1086,7 @@ class EnumBlock
         case BI_ENUM_VALUE_BLOCK_ID:
         {
             I->Members.emplace_back();
-            EnumValueBlock B(I->Members.back(), br_);
+            EnumValueBlock B(I->Members.back());
             if(auto Err = br_.readBlock(B, ID))
                 return Err;
             return llvm::Error::success();

source/lib/api/AST/BitcodeReader.cpp

@@ -44,7 +44,7 @@ getInfos()
         // Top level Version is first
         case BI_VERSION_BLOCK_ID:
         {
-            VersionBlock B(*this);
+            VersionBlock B;
             if (auto Err = readBlock(B, ID))
                 return std::move(Err);
             continue;

source/lib/api/AST/ParseJavadoc.cpp

@@ -401,7 +401,6 @@ class JavadocVisitor
     AnyList<Javadoc::Block> blocks_;
     AnyList<Javadoc::Param> params_;
     Javadoc::Paragraph* para_ = nullptr;
-    llvm::raw_string_ostream* os_ = nullptr;
 };
 
 //------------------------------------------------

source/lib/api/CorpusImpl.cpp

@@ -145,14 +145,11 @@ class CorpusImpl::
     Canonicalizer : public MutableVisitor
 {
     CorpusImpl& corpus_;
-    Reporter& R_;
 
 public:
     Canonicalizer(
-        CorpusImpl& corpus,
-        Reporter& R) noexcept
+        CorpusImpl& corpus) noexcept
         : corpus_(corpus)
-        , R_(R)
     {
     }
 
@@ -250,7 +247,7 @@ canonicalize(
         return;
     if(config_->verboseOutput)
         R.print("Canonicalizing...");
-    Canonicalizer cn(*this, R);
+    Canonicalizer cn(*this);
     traverse(cn, globalNamespaceID);
     std::string temp0;
     std::string temp1;

source/lib/api/_XML/XMLWriter.cpp

@@ -525,15 +525,26 @@ XMLWriter::
 writeMemberType(
     MemberTypeInfo const& I)
 {
-    tags_.open(dataMemberTagName, {
-        { "name", I.Name },
-        { "type", I.Type.Name },
-        { "value", I.DefaultValue, ! I.DefaultValue.empty() },
-        { &I.access },
-        { I.Type.id } });
-
-    write(I.Flags, tags_);
-    tags_.close("data");
+    if(I.Flags.raw == 0)
+    {
+        tags_.write(dataMemberTagName, "", {
+            { "name", I.Name },
+            { "type", I.Type.Name },
+            { "value", I.DefaultValue, ! I.DefaultValue.empty() },
+            { &I.access },
+            { I.Type.id } });
+    }
+    else
+    {
+        tags_.open(dataMemberTagName, {
+            { "name", I.Name },
+            { "type", I.Type.Name },
+            { "value", I.DefaultValue, ! I.DefaultValue.empty() },
+            { &I.access },
+            { I.Type.id } });
+        write(I.Flags, tags_);
+        tags_.close(dataMemberTagName);
+    }
 }
 
 //------------------------------------------------

test-files/old-tests/no_unique_address.xml

@@ -4,8 +4,7 @@
 <namespace name="">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file path="no_unique_address.cpp" line="5" class="def"/>
-    <data name="i" type="int">
-    </data>
+    <data name="i" type="int"/>
     <data name="e" type="Empty" id="iczIHP1J59EwYw3xxL3w2C3Q43Q=">
       <attr id="nodiscard"/>
       <attr id="deprecated"/>

test-files/old-tests/record-data.xml

@@ -4,29 +4,22 @@
 <namespace name="">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file path="record-data.cpp" line="3" class="def"/>
-    <data name="i" type="int">
-    </data>
-    <data name="j" type="double">
-    </data>
+    <data name="i" type="int"/>
+    <data name="j" type="double"/>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
     <file path="record-data.cpp" line="9" class="def"/>
-    <data name="t" type="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
-    </data>
+    <data name="t" type="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ="/>
   </struct>
   <struct name="W" id="6OhcFM3BV6KlrvmfpsljaMHxpdA=">
     <file path="record-data.cpp" line="23" class="def"/>
-    <data name="buf" type="char[64]">
-    </data>
+    <data name="buf" type="char[64]"/>
   </struct>
   <class name="V" id="9kzYwt0WPztMEDUaFxul1Jvqqs8=">
     <file path="record-data.cpp" line="14" class="def"/>
-    <data name="i" type="int" access="private">
-    </data>
-    <data name="j" type="unsigned long" access="protected">
-    </data>
-    <data name="k" type="double" access="private">
-    </data>
+    <data name="i" type="int" access="private"/>
+    <data name="j" type="unsigned long" access="protected"/>
+    <data name="k" type="double" access="private"/>
   </class>
 </namespace>
 </mrdox>