tidy

Author: vinniefalco

source/lib/Asciidoc.cpp

@@ -338,8 +338,8 @@ writeNameLink(
     llvm::SmallString<64> Path = R.getRelativeFilePath(CurrentPath);
     // Paths in Markdown use POSIX separators.
     llvm::sys::path::native(Path, llvm::sys::path::Style::posix);
-    llvm::sys::path::append(Path, llvm::sys::path::Style::posix,
-        R.getFileBaseName() + ".adoc");
+    //llvm::sys::path::append(Path, llvm::sys::path::Style::posix, R.getFileBaseName() + ".adoc");
+    llvm::sys::path::append(Path, llvm::sys::path::Style::posix, R.Name + ".adoc");
     os << "xref:" << Path << "#" << R.Name << "[" << R.Name << "]";
 }
 

source/lib/Info.cpp

@@ -106,6 +106,7 @@ getRelativeFilePath(
         IT, Path, extractName(), CurrentPath);
 }
 
+/*
 llvm::SmallString<16>
 Info::
 getFileBaseName() const
@@ -114,6 +115,7 @@ getFileBaseName() const
         return llvm::SmallString<16>("index");
     return extractName();
 }
+*/
 
 //------------------------------------------------
 

source/lib/Info.hpp

@@ -81,7 +81,7 @@ struct Info
     llvm::SmallString<64> getRelativeFilePath(llvm::StringRef const& CurrentPath) const;
 
     /// Returns the basename that should be used for this Info.
-    llvm::SmallString<16> getFileBaseName() const;
+    //llvm::SmallString<16> getFileBaseName() const;
 
     /** Return the fully qualified name.
     */

source/lib/Reference.cpp

@@ -24,6 +24,7 @@ getRelativeFilePath(
         RefType, Path, Name, CurrentPath);
 }
 
+/*
 llvm::SmallString<16>
 Reference::
 getFileBaseName() const
@@ -32,6 +33,7 @@ getFileBaseName() const
         return llvm::SmallString<16>("index");
     return Name;
 }
+*/
 
 bool
 Reference::

source/lib/Reference.hpp

@@ -86,7 +86,7 @@ struct Reference
     llvm::SmallString<64> getRelativeFilePath(llvm::StringRef const& CurrentPath) const;
 
     /// Returns the basename that should be used for this Reference.
-    llvm::SmallString<16> getFileBaseName() const;
+    //llvm::SmallString<16> getFileBaseName() const;
 };
 
 } // mrdox

source/lib/XML.cpp

@@ -336,8 +336,7 @@ write(
         //{ "usr", toString(ref.USR) }
         //});
     //writeTagLine("relpath", ref.getRelativeFilePath());
-    writeTagLine("basename",
-        I.getFileBaseName());
+    //writeTagLine("basename",I.getFileBaseName());
     writeTagLine("name", I.Name);
     writeTagLine("tag", std::to_string(static_cast<int>(I.RefType)));
     writeTagLine("path", I.Path);
@@ -351,13 +350,13 @@ Writer::
 writeInfo(
     Info const& I)
 {
-    writeTagLine("extract-name", I.extractName());
 #if 0
+    writeTagLine("extract-name", I.extractName());
     auto relPath = I.getRelativeFilePath(config_.SourceRoot);
     if(! relPath.empty())
         writeTagLine("rel-path", relPath);
-#endif
     writeTagLine("base-name", I.getFileBaseName());
+#endif
 }
 
 void

testfiles/2.cpp

@@ -1 +1,5 @@
+/** brief
+
+    desc
+*/
 namespace N {}

testfiles/2.xml

@@ -3,10 +3,6 @@
     <symbol name="N" usr="rjlMNXAaWNMkQYMTJzRA1DR0DiE="/>
 </all>
 <namespace name="">
-    <extract-name>GlobalNamespace</extract-name>
-    <base-name>index</base-name>
     <namespace name="N" usr="rjlMNXAaWNMkQYMTJzRA1DR0DiE=">
-        <extract-name>N</extract-name>
-        <base-name>index</base-name>
     </namespace>
 </namespace>