gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup utils::SplitPaths.

Browse Source 
Signed-off-by: Vassil Vassilev <vvasilev@cern.ch>
This commit is contained in:
Roman Zulak 2016-09-13 16:24:40 -04:00 committed by sftnight
parent 4c97ee61c6
commit 3d83bd70df
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cling/Utils/Paths.h
View File

@ -52,7 +52,7 @@ namespace cling {
bool SplitPaths(llvm::StringRef PathStr,
llvm::SmallVectorImpl<llvm::StringRef>& Paths,
SplitMode Mode = kPruneNonExistant,
llvm::StringRef Delim = llvm::StringRef(platform::kEnvDelim),
llvm::StringRef Delim = platform::kEnvDelim,
bool Verbose = false);
///\brief Adds multiple include paths separated by a delimter into the

37
lib/Utils/Paths.cpp
View File

@ -131,28 +131,36 @@ void LogNonExistantDirectory(llvm::StringRef Path) {
bool SplitPaths(llvm::StringRef PathStr,
llvm::SmallVectorImpl<llvm::StringRef>& Paths,
SplitMode Mode, llvm::StringRef Delim, bool Verbose) {
bool AllExisted = true;
#ifdef _MSC_VER
assert(Delim.size() && "Splitting without a delimiter");
#if defined(LLVM_ON_WIN32)
// Support using a ':' delimiter on Windows.
const bool WindowsColon = Delim.equals(":");
#endif
bool AllExisted = true;
for (std::pair<llvm::StringRef, llvm::StringRef> Split = PathStr.split(Delim);
!Split.second.empty(); Split = PathStr.split(Delim)) {
if (!Split.first.empty()) {
bool Exists = llvm::sys::fs::is_directory(Split.first);
#ifdef _MSC_VER
// TODO: Should this all go away and have user handle platform differences?
// Right now there are issues with CMake updating cling-compiledata.h
// and it was previoulsy generating 'C:\User\Path:G:\Another\Path'
#if defined(LLVM_ON_WIN32)
// Because drive letters will have a colon we have to make sure the split
// occurs at a colon not followed by a path separator.
if (!Exists && WindowsColon && Split.first.size()==1) {
std::pair<llvm::StringRef, llvm::StringRef> Tmp = Split.second.split(Delim);
// Split.first = 'C', but we want 'C:', so Tmp.first.size()+2
Split.first = llvm::StringRef(Split.first.data(), Tmp.first.size()+2);
Split.second = Tmp.second;
Exists = llvm::sys::fs::is_directory(Split.first);
// Both clang and cl.exe support '\' and '/' path separators.
if (Split.second.front() == '\\' || Split.second.front() == '/') {
const std::pair<llvm::StringRef, llvm::StringRef> Tmp =
Split.second.split(Delim);
// Split.first = 'C', but we want 'C:', so Tmp.first.size()+2
Split.first =
llvm::StringRef(Split.first.data(), Tmp.first.size() + 2);
Split.second = Tmp.second;
Exists = llvm::sys::fs::is_directory(Split.first);
}
}
#endif
#endif
AllExisted = AllExisted && Exists;
@ -185,7 +193,10 @@ bool SplitPaths(llvm::StringRef PathStr,
PathStr = Split.second;
}
// Add remaining part, can be empty from _MSC_VER code
// Trim trailing sep in case of A:B:C:D:
if (!PathStr.empty() && PathStr.endswith(Delim))
PathStr = PathStr.substr(0, PathStr.size()-Delim.size());
if (!PathStr.empty()) {
if (!llvm::sys::fs::is_directory(PathStr)) {
AllExisted = false;