hokein updated this revision to Diff 169712. hokein marked 2 inline comments as done. hokein added a comment.
createIndex => openIndex Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D53292 Files: clangd/index/dex/dexp/Dexp.cpp Index: clangd/index/dex/dexp/Dexp.cpp =================================================================== --- clangd/index/dex/dexp/Dexp.cpp +++ clangd/index/dex/dexp/Dexp.cpp @@ -31,9 +31,9 @@ namespace { llvm::cl::opt<std::string> - SymbolCollection("symbol-collection-file", - llvm::cl::desc("Path to the file with symbol collection"), - llvm::cl::Positional, llvm::cl::Required); + IndexPath("index-path", + llvm::cl::desc("Path to the index"), + llvm::cl::Positional, llvm::cl::Required); static const std::string Overview = R"( This is an **experimental** interactive tool to process user-provided search @@ -253,6 +253,10 @@ llvm::make_unique<Refs>}, }; +std::unique_ptr<SymbolIndex> openIndex(llvm::StringRef Index) { + return loadIndex(Index, /*URISchemes=*/{}, /*UseDex=*/true); +} + } // namespace int main(int argc, const char *argv[]) { @@ -262,13 +266,11 @@ std::unique_ptr<SymbolIndex> Index; reportTime("Dex build", [&]() { - Index = loadIndex(SymbolCollection, /*URISchemes=*/{}, - /*UseDex=*/true); + Index = openIndex(IndexPath); }); if (!Index) { - llvm::outs() - << "ERROR: Please provide a valid path to symbol collection file.\n"; + llvm::outs() << "Failed to open the index.\n"; return -1; }
Index: clangd/index/dex/dexp/Dexp.cpp =================================================================== --- clangd/index/dex/dexp/Dexp.cpp +++ clangd/index/dex/dexp/Dexp.cpp @@ -31,9 +31,9 @@ namespace { llvm::cl::opt<std::string> - SymbolCollection("symbol-collection-file", - llvm::cl::desc("Path to the file with symbol collection"), - llvm::cl::Positional, llvm::cl::Required); + IndexPath("index-path", + llvm::cl::desc("Path to the index"), + llvm::cl::Positional, llvm::cl::Required); static const std::string Overview = R"( This is an **experimental** interactive tool to process user-provided search @@ -253,6 +253,10 @@ llvm::make_unique<Refs>}, }; +std::unique_ptr<SymbolIndex> openIndex(llvm::StringRef Index) { + return loadIndex(Index, /*URISchemes=*/{}, /*UseDex=*/true); +} + } // namespace int main(int argc, const char *argv[]) { @@ -262,13 +266,11 @@ std::unique_ptr<SymbolIndex> Index; reportTime("Dex build", [&]() { - Index = loadIndex(SymbolCollection, /*URISchemes=*/{}, - /*UseDex=*/true); + Index = openIndex(IndexPath); }); if (!Index) { - llvm::outs() - << "ERROR: Please provide a valid path to symbol collection file.\n"; + llvm::outs() << "Failed to open the index.\n"; return -1; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits