bulbazord created this revision.
bulbazord added reviewers: JDevlieghere, jingham, mib, jasonmolenda.
Herald added a project: All.
bulbazord requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
This patch introduces FileSpec::GetComponents, a method that splits a
FileSpec's path into its individual components. For example, given
/foo/bar/baz, you'll get back a vector of strings {"foo", "bar", baz"}.
The motivation here is to reduce the use of
`FileSpec::RemoveLastPathComponent`. Mutating a FileSpec is expensive,
so providing a way of doing this without mutation is useful.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D151399
Files:
lldb/include/lldb/Utility/FileSpec.h
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
lldb/source/Utility/FileSpec.cpp
lldb/unittests/Utility/FileSpecTest.cpp
Index: lldb/unittests/Utility/FileSpecTest.cpp
===================================================================
--- lldb/unittests/Utility/FileSpecTest.cpp
+++ lldb/unittests/Utility/FileSpecTest.cpp
@@ -504,3 +504,33 @@
EXPECT_FALSE(win_noext.IsSourceImplementationFile());
EXPECT_FALSE(exe.IsSourceImplementationFile());
}
+
+TEST(FileSpecTest, TestGetComponents) {
+ std::pair<llvm::StringRef, std::vector<std::string>> PosixTests[] = {
+ {"/", {}},
+ {"/foo", {"foo"}},
+ {"/foo/", {"foo"}},
+ {"/foo/bar", {"foo", "bar"}},
+ {"/llvm-project/lldb/unittests/Utility/FileSpecTest.cpp",
+ {"llvm-project", "lldb", "unittests", "Utility", "FileSpecTest.cpp"}},
+ };
+
+ for (const auto &pair : PosixTests) {
+ FileSpec file_spec = PosixSpec(pair.first);
+ EXPECT_EQ(file_spec.GetComponents(), pair.second);
+ }
+
+ std::pair<llvm::StringRef, std::vector<std::string>> WindowsTests[] = {
+ {"C:\\", {"C:"}},
+ {"C:\\Windows\\", {"C:", "Windows"}},
+ {"C:\\Windows\\System32", {"C:", "Windows", "System32"}},
+ {"C:\\llvm-project\\lldb\\unittests\\Utility\\FileSpecTest.cpp",
+ {"C:", "llvm-project", "lldb", "unittests", "Utility",
+ "FileSpecTest.cpp"}},
+ };
+
+ for (const auto &pair : WindowsTests) {
+ FileSpec file_spec = WindowsSpec(pair.first);
+ EXPECT_EQ(file_spec.GetComponents(), pair.second);
+ }
+}
Index: lldb/source/Utility/FileSpec.cpp
===================================================================
--- lldb/source/Utility/FileSpec.cpp
+++ lldb/source/Utility/FileSpec.cpp
@@ -463,6 +463,26 @@
}
return false;
}
+
+std::vector<std::string> FileSpec::GetComponents() const {
+ std::vector<std::string> components;
+
+ llvm::SmallString<64> current_path;
+ GetPath(current_path, false);
+
+ auto begin = llvm::sys::path::begin(current_path, m_style);
+ auto end = llvm::sys::path::end(current_path);
+
+ for (auto iter = begin; iter != end; ++iter) {
+ if (*iter == "/" || *iter == ".")
+ continue;
+
+ components.push_back(iter->str());
+ }
+
+ return components;
+}
+
/// Returns true if the filespec represents an implementation source
/// file (files with a ".c", ".cpp", ".m", ".mm" (many more)
/// extension).
Index: lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
===================================================================
--- lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -1236,13 +1236,9 @@
// "UIFoundation" and "UIFoundation.framework" -- most likely the latter
// will be the one we find there.
- FileSpec platform_pull_upart(platform_file);
- std::vector<std::string> path_parts;
- path_parts.push_back(platform_pull_upart.GetFilename().AsCString());
- while (platform_pull_upart.RemoveLastPathComponent()) {
- ConstString part = platform_pull_upart.GetFilename();
- path_parts.push_back(part.AsCString());
- }
+ std::vector<std::string> path_components = platform_file.GetComponents();
+ // We want the components in reverse order.
+ std::reverse(path_components.begin(), path_components.end());
const size_t path_parts_size = path_parts.size();
size_t num_module_search_paths = module_search_paths_ptr->GetSize();
Index: lldb/include/lldb/Utility/FileSpec.h
===================================================================
--- lldb/include/lldb/Utility/FileSpec.h
+++ lldb/include/lldb/Utility/FileSpec.h
@@ -408,6 +408,17 @@
/// A boolean value indicating whether the path was updated.
bool RemoveLastPathComponent();
+ /// Gets the components of the FileSpec's path.
+ /// For example, given the path:
+ /// /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
+ ///
+ /// This function returns:
+ /// {"System", "Library", "PrivateFrameworks", "UIFoundation.framework",
+ /// "UIFoundation"}
+ /// \return
+ /// A std::vector of std::strings for each path component.
+ std::vector<std::string> GetComponents() const;
+
protected:
// Convenience method for setting the file without changing the style.
void SetFile(llvm::StringRef path);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
