[llvm-commits] [llvm] r120559 - in /llvm/trunk: lib/Support/PathV2.cpp unittests/Support/Path.cpp
Michael J. Spencer
bigcheesegs at gmail.com
Tue Nov 30 22:03:51 PST 2010
Author: mspencer
Date: Wed Dec 1 00:03:50 2010
New Revision: 120559
URL: http://llvm.org/viewvc/llvm-project?rev=120559&view=rev
Log:
Support/PathV2: Add has_{root_path,root_name,root_directory,parent_path,filename,stem,extension} implementation.
Modified:
llvm/trunk/lib/Support/PathV2.cpp
llvm/trunk/unittests/Support/Path.cpp
Modified: llvm/trunk/lib/Support/PathV2.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/PathV2.cpp?rev=120559&r1=120558&r2=120559&view=diff
==============================================================================
--- llvm/trunk/lib/Support/PathV2.cpp (original)
+++ llvm/trunk/lib/Support/PathV2.cpp Wed Dec 1 00:03:50 2010
@@ -370,24 +370,6 @@
return make_error_code(errc::success);
}
-error_code has_root_name(const Twine &path, bool &result) {
- SmallString<128> storage;
- StringRef p = path.toStringRef(storage);
-
- if (error_code ec = root_name(p, p)) return ec;
- result = !p.empty();
- return make_error_code(errc::success);
-}
-
-error_code has_root_directory(const Twine &path, bool &result) {
- SmallString<128> storage;
- StringRef p = path.toStringRef(storage);
-
- if (error_code ec = root_directory(p, p)) return ec;
- result = !p.empty();
- return make_error_code(errc::success);
-}
-
error_code relative_path(const StringRef &path, StringRef &result) {
StringRef root;
if (error_code ec = root_path(path, root)) return ec;
@@ -590,6 +572,76 @@
return make_error_code(errc::success);
}
+error_code has_root_name(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = root_name(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_root_directory(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = root_directory(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_root_path(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = root_path(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_filename(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = filename(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_parent_path(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = parent_path(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_stem(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = stem(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
+error_code has_extension(const Twine &path, bool &result) {
+ SmallString<128> path_storage;
+ StringRef p = path.toStringRef(path_storage);
+
+ if (error_code ec = extension(p, p)) return ec;
+
+ result = !p.empty();
+ return make_error_code(errc::success);
+}
+
}
}
}
Modified: llvm/trunk/unittests/Support/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/Path.cpp?rev=120559&r1=120558&r2=120559&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/Path.cpp (original)
+++ llvm/trunk/unittests/Support/Path.cpp Wed Dec 1 00:03:50 2010
@@ -96,13 +96,21 @@
}
outs() << "]\n";
+ bool bres;
StringRef sfres;
+ TEST_PATH(has_root_path, *i, bres);
TEST_PATH(root_path, *i, sfres);
+ TEST_PATH(has_root_name, *i, bres);
TEST_PATH(root_name, *i, sfres);
+ TEST_PATH(has_root_directory, *i, bres);
TEST_PATH(root_directory, *i, sfres);
+ TEST_PATH(has_parent_path, *i, bres);
TEST_PATH(parent_path, *i, sfres);
+ TEST_PATH(has_filename, *i, bres);
TEST_PATH(filename, *i, sfres);
+ TEST_PATH(has_stem, *i, bres);
TEST_PATH(stem, *i, sfres);
+ TEST_PATH(has_extension, *i, bres);
TEST_PATH(extension, *i, sfres);
SmallString<16> temp_store;
More information about the llvm-commits
mailing list