Add functions back in

Author: mcbarton

lib/Interpreter/Paths.cpp

@@ -233,6 +233,11 @@ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
     incpaths.push_back("-v");
 }
 
+void LogNonExistantDirectory(llvm::StringRef Path) {
+#define DEBUG_TYPE "LogNonExistantDirectory"
+  LLVM_DEBUG(dbgs() << "  ignoring nonexistent directory \"" << Path << "\"\n");
+#undef  DEBUG_TYPE
+}
 
 bool SplitPaths(llvm::StringRef PathStr,
                 llvm::SmallVectorImpl<llvm::StringRef>& Paths,
@@ -322,5 +327,42 @@ bool SplitPaths(llvm::StringRef PathStr,
 }
 
 
+void AddIncludePaths(llvm::StringRef PathStr,
+                         clang::HeaderSearchOptions& HOpts,
+                         const char* Delim /* = Cpp::utils::platform::kEnvDelim */) {
+#define DEBUG_TYPE "AddIncludePaths"
+
+  llvm::SmallVector<llvm::StringRef, 10> Paths;
+  if (Delim && *Delim)
+    SplitPaths(PathStr, Paths, kAllowNonExistant, Delim, HOpts.Verbose);
+  else
+    Paths.push_back(PathStr);
+
+  // Avoid duplicates
+  llvm::SmallVector<llvm::StringRef, 10> PathsChecked;
+  for (llvm::StringRef Path : Paths) {
+    bool Exists = false;
+    for (const clang::HeaderSearchOptions::Entry& E : HOpts.UserEntries) {
+      if ((Exists = E.Path == Path))
+        break;
+    }
+    if (!Exists)
+      PathsChecked.push_back(Path);
+  }
+
+  const bool IsFramework = false;
+  const bool IsSysRootRelative = true;
+  for (llvm::StringRef Path : PathsChecked)
+    HOpts.AddPath(Path, clang::frontend::Angled, IsFramework, IsSysRootRelative);
+
+  if (HOpts.Verbose) {
+    LLVM_DEBUG(dbgs() << "Added include paths:\n");
+    for (llvm::StringRef Path : PathsChecked)
+      LLVM_DEBUG(dbgs() << "  " << Path << "\n");
+  }
+
+#undef  DEBUG_TYPE
+}
+
 } // namespace utils
 } // namespace Cpp

lib/Interpreter/Paths.h

@@ -83,6 +83,22 @@ bool SplitPaths(llvm::StringRef PathStr,
                 llvm::StringRef Delim = Cpp::utils::platform::kEnvDelim,
                 bool Verbose = false);
 
+///\brief Adds multiple include paths separated by a delimter into the
+/// given HeaderSearchOptions.  This adds the paths but does no further
+/// processing. See Interpreter::AddIncludePaths or CIFactory::createCI
+/// for examples of what needs to be done once the paths have been added.
+///
+///\param[in] PathStr - Path(s)
+///\param[in] Opts - HeaderSearchOptions to add paths into
+///\param[in] Delim - Delimiter to separate paths or NULL if a single path
+///
+void AddIncludePaths(llvm::StringRef PathStr, clang::HeaderSearchOptions& HOpts,
+                     const char* Delim = Cpp::utils::platform::kEnvDelim);
+
+///\brief Write to cling::errs that directory does not exist in a format
+/// matching what 'clang -v' would do
+///
+void LogNonExistantDirectory(llvm::StringRef Path);
 
 ///\brief Copies the current include paths into the HeaderSearchOptions.
 ///