Support/PathV2: Add stem implementation.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120547 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/PathV2.cpp b/lib/Support/PathV2.cpp
index 9c343ea0060027c79bcffb8bf3012ce8c6ebd68b..e360e9cd1fef0d0c584ecb68d1bcf1be7a825597 100644 (file)
--- a/lib/Support/PathV2.cpp
+++ b/lib/Support/PathV2.cpp
@@ -558,6 +558,22 @@ error_code filename(const StringRef &path, StringRef &result) {
   return make_error_code(errc::success);
 }
 
+error_code stem(const StringRef &path, StringRef &result) {
+  StringRef fname;
+  if (error_code ec = filename(path, fname)) return ec;
+  size_t pos = fname.find_last_of('.');
+  if (pos == StringRef::npos)
+    result = fname;
+  else
+    if ((fname.size() == 1 && fname == ".") ||
+        (fname.size() == 2 && fname == ".."))
+      result = fname;
+    else
+      result = StringRef(fname.begin(), pos);
+
+  return make_error_code(errc::success);
+}
+
 }
 }
 }

diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp
index 0dae960f48fec95763cea9e36a5d172760062f6b..70cf213f1917a69de59a9fcc85dc60874bb14dec 100644 (file)
--- a/unittests/Support/Path.cpp
+++ b/unittests/Support/Path.cpp
@@ -97,6 +97,9 @@ TEST(Support, Path) {
     if (error_code ec = sys::path::filename(*i, res))
       ASSERT_FALSE(ec.message().c_str());
     outs() << "    filename: " << res << '\n';
+    if (error_code ec = sys::path::stem(*i, res))
+      ASSERT_FALSE(ec.message().c_str());
+    outs() << "    stem: " << res << '\n';
 
     temp_store = *i;
     if (error_code ec = sys::path::make_absolute(temp_store))
@@ -110,6 +113,10 @@ TEST(Support, Path) {
     if (error_code ec = sys::path::replace_extension(temp_store, "ext"))
       ASSERT_FALSE(ec.message().c_str());
     outs() << "    replace_extension: " << temp_store << '\n';
+    if (error_code ec = sys::path::stem(
+      StringRef(temp_store.begin(), temp_store.size()), res))
+      ASSERT_FALSE(ec.message().c_str());
+    outs() << "    stem: " << res << '\n';
     if (error_code ec = sys::path::native(*i, temp_store))
       ASSERT_FALSE(ec.message().c_str());
     outs() << "    native: " << temp_store << '\n';