maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Replace all uses of PathV1::get{Basename,Dirname,Suffix} with their PathV2 equivalents. 

llvm-svn: 122140
This commit is contained in:
Michael J. Spencer 2010-12-18 04:13:32 +00:00
parent 1ea7f18caa
commit e47230f9b5
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Checker/AnalysisConsumer.cpp
View File

@ -50,8 +50,8 @@ static ExplodedNode::Auditor* CreateUbiViz();
static PathDiagnosticClient*
createPlistHTMLDiagnosticClient(const std::string& prefix,
const Preprocessor &PP) {
llvm::sys::Path F(prefix);
PathDiagnosticClient *PD = createHTMLDiagnosticClient(F.getDirname(), PP);
PathDiagnosticClient *PD =
createHTMLDiagnosticClient(llvm::sys::path::parent_path(prefix), PP);
return createPlistDiagnosticClient(prefix, PP, PD);
}

19
clang/lib/Driver/Driver.cpp
View File

@ -77,21 +77,16 @@ Driver::Driver(llvm::StringRef _ClangExecutable,
CCCUseClangCXX = false;
}
llvm::sys::Path Executable(ClangExecutable);
Name = Executable.getBasename();
Dir = Executable.getDirname();
Name = llvm::sys::path::stem(ClangExecutable);
Dir = llvm::sys::path::parent_path(ClangExecutable);
// Compute the path to the resource directory.
llvm::StringRef ClangResourceDir(CLANG_RESOURCE_DIR);
llvm::sys::Path P(Dir);
if (ClangResourceDir != "") {
P.appendComponent(ClangResourceDir);
} else {
P.appendComponent(".."); // Walk up from a 'bin' subdirectory.
P.appendComponent("lib");
P.appendComponent("clang");
P.appendComponent(CLANG_VERSION_STRING);
}
llvm::SmallString<128> P(Dir);
if (ClangResourceDir != "")
llvm::sys::path::append(P, ClangResourceDir);
else
llvm::sys::path::append(P, "..", "lib", "clang", CLANG_VERSION_STRING);
ResourceDir = P.str();
}

9
clang/lib/Rewrite/FrontendActions.cpp
View File

@ -58,11 +58,10 @@ public:
}
std::string RewriteFilename(const std::string &Filename) {
llvm::sys::Path Path(Filename);
std::string Suffix = Path.getSuffix();
Path.eraseSuffix();
Path.appendSuffix(NewSuffix + "." + Suffix);
return Path.c_str();
llvm::SmallString<128> Path(Filename);
llvm::sys::path::replace_extension(Path,
NewSuffix + llvm::sys::path::extension(Path));
return Path.str();
}
};
} // end anonymous namespace

4
clang/tools/driver/driver.cpp
View File

@ -287,7 +287,7 @@ int main(int argc_, const char **argv_) {
TextDiagnosticPrinter *DiagClient
= new TextDiagnosticPrinter(llvm::errs(), DiagnosticOptions());
DiagClient->setPrefix(Path.getBasename());
DiagClient->setPrefix(llvm::sys::path::stem(Path.str()));
llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
Diagnostic Diags(DiagID, DiagClient);
@ -331,7 +331,7 @@ int main(int argc_, const char **argv_) {
//
// We use *argv instead of argv[0] to work around a bogus g++ warning.
const char *progname = argv_[0];
std::string ProgName(llvm::sys::Path(progname).getBasename());
std::string ProgName(llvm::sys::path::stem(progname));
if (llvm::StringRef(ProgName).endswith("++") ||
llvm::StringRef(ProgName).rsplit('-').first.endswith("++")) {
TheDriver.CCCIsCXX = true;