diff options
Diffstat (limited to 'clang-tools-extra/clang-doc/JSONGenerator.cpp')
| -rw-r--r-- | clang-tools-extra/clang-doc/JSONGenerator.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/clang-tools-extra/clang-doc/JSONGenerator.cpp b/clang-tools-extra/clang-doc/JSONGenerator.cpp index 93ec90e..9a770d7 100644 --- a/clang-tools-extra/clang-doc/JSONGenerator.cpp +++ b/clang-tools-extra/clang-doc/JSONGenerator.cpp @@ -581,22 +581,14 @@ static SmallString<16> determineFileName(Info *I, SmallString<128> &Path) { if (I->IT == InfoType::IT_record) { auto *RecordSymbolInfo = static_cast<SymbolInfo *>(I); FileName = RecordSymbolInfo->MangledName; - } else if (I->USR == GlobalNamespaceID) + } else if (I->IT == InfoType::IT_namespace) { FileName = "index"; - else if (I->IT == InfoType::IT_namespace) { - for (const auto &NS : I->Namespace) { - FileName += NS.Name; - FileName += "_"; - } - FileName += I->Name; } else FileName = I->Name; sys::path::append(Path, FileName + ".json"); return FileName; } -// FIXME: Revert back to creating nested directories for namespaces instead of -// putting everything in a flat directory structure. Error JSONGenerator::generateDocs( StringRef RootDir, llvm::StringMap<std::unique_ptr<doc::Info>> Infos, const ClangDocContext &CDCtx) { @@ -609,6 +601,7 @@ Error JSONGenerator::generateDocs( auto RootDirStr = RootDir.str() + "/json"; StringRef JSONDir = StringRef(RootDirStr); sys::path::native(JSONDir, Path); + sys::path::append(Path, Info->getRelativeFilePath("")); if (!CreatedDirs.contains(Path)) { if (std::error_code Err = sys::fs::create_directories(Path); Err != std::error_code()) |