Resubmit "Delete the remainder of platform specific code in FileSpec."

This was causing a test failure in one of LLDB's tests which
specifically dealt with a limitation in LLVM's implementation
of home_directory() that LLDB's own implementation had worked
around.

This limitation has been addressed in r298513 on the LLVM side,
so the failing test (which is now unnecessary as the limitation
no longer exists) was removed in r298519, allowing this patch to
be re-submitted without modification.

llvm-svn: 298526

5 files changed, 166 insertions, 0 deletions

diff --git a/lldb/unittests/Utility/CMakeLists.txt b/lldb/unittests/Utility/CMakeLists.txt
index 782f4e52ed7..60868bcb414 100644
--- a/lldb/unittests/Utility/CMakeLists.txt
+++ b/lldb/unittests/Utility/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(Mocks)
+
 add_lldb_unittest(UtilityTests
   ConstStringTest.cpp
   ErrorTest.cpp
@@ -5,12 +7,14 @@ add_lldb_unittest(UtilityTests
   NameMatchesTest.cpp
   StringExtractorTest.cpp
   TaskPoolTest.cpp
+  TildeExpressionResolverTest.cpp
   TimeoutTest.cpp
   UriParserTest.cpp
   VASprintfTest.cpp
 
   LINK_LIBS
       lldbUtility
+      lldbUtilityMocks
   LINK_COMPONENTS
     Support
   )
diff --git a/lldb/unittests/Utility/Mocks/CMakeLists.txt b/lldb/unittests/Utility/Mocks/CMakeLists.txt
new file mode 100644
index 00000000000..57db5bf3b62
--- /dev/null
+++ b/lldb/unittests/Utility/Mocks/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_lldb_library(lldbUtilityMocks
+  MockTildeExpressionResolver.cpp
+
+  LINK_LIBS
+    lldbUtility
+
+  LINK_COMPONENTS
+    Support
+  )
diff --git a/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.cpp b/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.cpp
new file mode 100644
index 00000000000..832836682b5
--- /dev/null
+++ b/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.cpp
@@ -0,0 +1,80 @@
+//===----------------- MockTildeExpressionResolver.cpp ----------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "MockTildeExpressionResolver.h"
+#include "llvm/Support/Path.h"
+
+using namespace lldb_private;
+using namespace llvm;
+
+MockTildeExpressionResolver::MockTildeExpressionResolver(StringRef CurrentUser,
+                                                         StringRef HomeDir)
+    : CurrentUser(CurrentUser) {
+  UserDirectories.insert(std::make_pair(CurrentUser, HomeDir));
+}
+
+void MockTildeExpressionResolver::AddKnownUser(StringRef User,
+                                               StringRef HomeDir) {
+  assert(UserDirectories.find(User) == UserDirectories.end());
+  UserDirectories.insert(std::make_pair(User, HomeDir));
+}
+
+void MockTildeExpressionResolver::Clear() {
+  CurrentUser = StringRef();
+  UserDirectories.clear();
+}
+
+void MockTildeExpressionResolver::SetCurrentUser(StringRef User) {
+  assert(UserDirectories.find(User) != UserDirectories.end());
+  CurrentUser = User;
+}
+
+bool MockTildeExpressionResolver::ResolveExact(StringRef Expr,
+                                               SmallVectorImpl<char> &Output) {
+  Output.clear();
+
+  assert(!llvm::any_of(
+      Expr, [](char c) { return llvm::sys::path::is_separator(c); }));
+  assert(Expr.empty() || Expr[0] == '~');
+  Expr = Expr.drop_front();
+  if (Expr.empty()) {
+    auto Dir = UserDirectories[CurrentUser];
+    Output.append(Dir.begin(), Dir.end());
+    return true;
+  }
+
+  for (const auto &User : UserDirectories) {
+    if (User.getKey() != Expr)
+      continue;
+    Output.append(User.getValue().begin(), User.getValue().end());
+    return true;
+  }
+  return false;
+}
+
+bool MockTildeExpressionResolver::ResolvePartial(StringRef Expr,
+                                                 StringSet<> &Output) {
+  Output.clear();
+
+  assert(!llvm::any_of(
+      Expr, [](char c) { return llvm::sys::path::is_separator(c); }));
+  assert(Expr.empty() || Expr[0] == '~');
+  Expr = Expr.drop_front();
+
+  SmallString<16> QualifiedName("~");
+  for (const auto &User : UserDirectories) {
+    if (!User.getKey().startswith(Expr))
+      continue;
+    QualifiedName.resize(1);
+    QualifiedName.append(User.getKey().begin(), User.getKey().end());
+    Output.insert(QualifiedName);
+  }
+
+  return !Output.empty();
+}
diff --git a/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.h b/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.h
new file mode 100644
index 00000000000..7ae5623f839
--- /dev/null
+++ b/lldb/unittests/Utility/Mocks/MockTildeExpressionResolver.h
@@ -0,0 +1,37 @@
+//===--------------------- TildeExpressionResolver.h ------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_UNITTESTS_UTILITY_MOCKS_MOCK_TILDE_EXPRESSION_RESOLVER_H
+#define LLDB_UNITTESTS_UTILITY_MOCKS_MOCK_TILDE_EXPRESSION_RESOLVER_H
+
+#include "lldb/Utility/TildeExpressionResolver.h"
+
+#include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringMap.h"
+
+namespace lldb_private {
+class MockTildeExpressionResolver : public TildeExpressionResolver {
+  llvm::StringRef CurrentUser;
+  llvm::StringMap<llvm::StringRef> UserDirectories;
+
+public:
+  MockTildeExpressionResolver(llvm::StringRef CurrentUser,
+                              llvm::StringRef HomeDir);
+
+  void AddKnownUser(llvm::StringRef User, llvm::StringRef HomeDir);
+  void Clear();
+  void SetCurrentUser(llvm::StringRef User);
+
+  bool ResolveExact(llvm::StringRef Expr,
+                    llvm::SmallVectorImpl<char> &Output) override;
+  bool ResolvePartial(llvm::StringRef Expr, llvm::StringSet<> &Output) override;
+};
+}
+
+#endif
diff --git a/lldb/unittests/Utility/TildeExpressionResolverTest.cpp b/lldb/unittests/Utility/TildeExpressionResolverTest.cpp
new file mode 100644
index 00000000000..fd953390ed5
--- /dev/null
+++ b/lldb/unittests/Utility/TildeExpressionResolverTest.cpp
@@ -0,0 +1,36 @@
+#include "gtest/gtest.h"
+
+#include "Mocks/MockTildeExpressionResolver.h"
+#include "lldb/Utility/TildeExpressionResolver.h"
+
+#include "llvm/ADT/SmallString.h"
+
+using namespace llvm;
+using namespace lldb_private;
+
+TEST(TildeExpressionResolver, ResolveFullPath) {
+  MockTildeExpressionResolver Resolver("James", "/james");
+  Resolver.AddKnownUser("Kirk", "/kirk");
+  Resolver.AddKnownUser("Lars", "/lars");
+  Resolver.AddKnownUser("Jason", "/jason");
+  Resolver.AddKnownUser("Larry", "/larry");
+
+  SmallString<32> Result;
+  ASSERT_TRUE(Resolver.ResolveFullPath("~", Result));
+  EXPECT_EQ("/james", Result);
+  ASSERT_TRUE(Resolver.ResolveFullPath("~/", Result));
+  EXPECT_EQ("/james/", Result);
+
+  ASSERT_TRUE(Resolver.ResolveFullPath("~James/bar/baz", Result));
+  EXPECT_EQ("/james/bar/baz", Result);
+
+  ASSERT_TRUE(Resolver.ResolveFullPath("~Jason/", Result));
+  EXPECT_EQ("/jason/", Result);
+
+  ASSERT_TRUE(Resolver.ResolveFullPath("~Lars", Result));
+  EXPECT_EQ("/lars", Result);
+
+  ASSERT_FALSE(Resolver.ResolveFullPath("~Jaso", Result));
+  ASSERT_FALSE(Resolver.ResolveFullPath("", Result));
+  ASSERT_FALSE(Resolver.ResolveFullPath("Jason", Result));
+}