summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2004-11-05 22:15:36 +0000
committerReid Spencer <rspencer@reidspencer.com>2004-11-05 22:15:36 +0000
commit07adb2836b8aa7a3872e33c285958f5937662b50 (patch)
tree9a68836881a4c9d0c8c33ba18a3fc310aac3aed3 /lib
parent6c4d9e566f60be60db105c220626bf31bf3ce450 (diff)
Stop propagating method names that violate the coding standard
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17498 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Linker/LinkModules.cpp6
-rw-r--r--lib/System/AIX/Path.cpp6
-rw-r--r--lib/System/Cygwin/Path.cpp6
-rw-r--r--lib/System/Darwin/Path.cpp6
-rw-r--r--lib/System/FreeBSD/Path.cpp6
-rw-r--r--lib/System/Interix/Path.cpp6
-rw-r--r--lib/System/Linux/Path.cpp6
-rw-r--r--lib/System/SunOS/Path.cpp6
-rw-r--r--lib/System/Unix/Path.cpp110
-rw-r--r--lib/System/Unix/Path.inc110
-rw-r--r--lib/System/Unix/Program.cpp6
-rw-r--r--lib/System/Unix/Program.inc6
-rw-r--r--lib/System/Unix/Signals.cpp4
-rw-r--r--lib/System/Unix/Signals.inc4
-rw-r--r--lib/System/Win32/Path.cpp118
-rw-r--r--lib/System/Win32/Path.inc118
-rw-r--r--lib/System/Win32/Program.cpp2
-rw-r--r--lib/System/Win32/Program.inc2
-rw-r--r--lib/System/Win32/Signals.cpp6
-rw-r--r--lib/System/Win32/Signals.inc6
-rw-r--r--lib/VMCore/Linker.cpp6
21 files changed, 273 insertions, 273 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index fbf09781bae..a07caf3b696 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -946,9 +946,9 @@ bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
// If the source library's module id is in the dependent library list of the
// destination library, remove it since that module is now linked in.
sys::Path modId;
- modId.set_file(Src->getModuleIdentifier());
- if (!modId.is_empty())
- Dest->removeLibrary(modId.get_basename());
+ modId.setFile(Src->getModuleIdentifier());
+ if (!modId.isEmpty())
+ Dest->removeLibrary(modId.getBasename());
return false;
}
diff --git a/lib/System/AIX/Path.cpp b/lib/System/AIX/Path.cpp
index 0d6c7fbd152..8eddb967bd3 100644
--- a/lib/System/AIX/Path.cpp
+++ b/lib/System/AIX/Path.cpp
@@ -24,7 +24,7 @@ using namespace sys;
//===----------------------------------------------------------------------===//
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
if (path.length() >= MAXPATHLEN)
@@ -43,8 +43,8 @@ Path::GetTemporaryDirectory() {
if (!mkdir(TmpName, S_IRWXU))
ThrowErrno(std::string(TmpName) + ": Can't create temporary directory");
Path result;
- result.set_directory(TmpName);
- assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ result.setDirectory(TmpName);
+ assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
}
diff --git a/lib/System/Cygwin/Path.cpp b/lib/System/Cygwin/Path.cpp
index 5b7d02ff937..3b95665f16a 100644
--- a/lib/System/Cygwin/Path.cpp
+++ b/lib/System/Cygwin/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
char pathname[MAXPATHLEN];
@@ -39,9 +39,9 @@ Path::GetTemporaryDirectory() {
if (0 == pathname)
ThrowErrno(std::string("Can't create temporary directory name"));
Path result;
- result.set_directory(pathname);
+ result.setDirectory(pathname);
free(pathname);
- assert(result.is_valid() && "tempnam didn't create a valid pathname!");
+ assert(result.isValid() && "tempnam didn't create a valid pathname!");
if (0 != mkdir(result.c_str(), S_IRWXU))
ThrowErrno(result.get() + ": Can't create temporary directory");
return result;
diff --git a/lib/System/Darwin/Path.cpp b/lib/System/Darwin/Path.cpp
index 1edb15450b7..ed391079487 100644
--- a/lib/System/Darwin/Path.cpp
+++ b/lib/System/Darwin/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
if (path.length() >= MAXPATHLEN)
@@ -38,8 +38,8 @@ Path::GetTemporaryDirectory() {
if (0 == mkdtemp(pathname))
ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
Path result;
- result.set_directory(pathname);
- assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ result.setDirectory(pathname);
+ assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
}
diff --git a/lib/System/FreeBSD/Path.cpp b/lib/System/FreeBSD/Path.cpp
index 61b25024b1e..21bc4e17659 100644
--- a/lib/System/FreeBSD/Path.cpp
+++ b/lib/System/FreeBSD/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isvalid() const {
if (path.empty())
return false;
char pathname[MAXPATHLEN];
@@ -40,8 +40,8 @@ Path::GetTemporaryDirectory() {
if (0 == mkdtemp(pathname))
ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
Path result;
- result.set_directory(pathname);
- assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ result.setDirectory(pathname);
+ assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
}
diff --git a/lib/System/Interix/Path.cpp b/lib/System/Interix/Path.cpp
index 47f6c5d7db1..45ab13a6dc6 100644
--- a/lib/System/Interix/Path.cpp
+++ b/lib/System/Interix/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
char pathname[MAXPATHLEN];
@@ -40,8 +40,8 @@ Path::GetTemporaryDirectory() {
if (0 == mkdtemp(pathname))
ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
Path result;
- result.set_directory(pathname);
- assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ result.setDirectory(pathname);
+ assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
}
diff --git a/lib/System/Linux/Path.cpp b/lib/System/Linux/Path.cpp
index 665c272841e..5238c1f329b 100644
--- a/lib/System/Linux/Path.cpp
+++ b/lib/System/Linux/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
char pathname[MAXPATHLEN];
@@ -40,8 +40,8 @@ Path::GetTemporaryDirectory() {
if (0 == mkdtemp(pathname))
ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
Path result;
- result.set_directory(pathname);
- assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+ result.setDirectory(pathname);
+ assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
return result;
}
diff --git a/lib/System/SunOS/Path.cpp b/lib/System/SunOS/Path.cpp
index 4ba83ff89ee..7fac37d8d2e 100644
--- a/lib/System/SunOS/Path.cpp
+++ b/lib/System/SunOS/Path.cpp
@@ -23,7 +23,7 @@ namespace llvm {
using namespace sys;
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
char pathname[MAXPATHLEN];
@@ -39,9 +39,9 @@ Path::GetTemporaryDirectory() {
if (0 == pathname)
ThrowErrno(std::string("Can't create temporary directory name"));
Path result;
- result.set_directory(pathname);
+ result.setDirectory(pathname);
free(pathname);
- assert(result.is_valid() && "tempnam didn't create a valid pathname!");
+ assert(result.isValid() && "tempnam didn't create a valid pathname!");
if (0 != mkdir(result.c_str(), S_IRWXU))
ThrowErrno(result.get() + ": Can't create temporary directory");
return result;
diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp
index c9333decbfd..4f4d347f092 100644
--- a/lib/System/Unix/Path.cpp
+++ b/lib/System/Unix/Path.cpp
@@ -30,7 +30,7 @@ Path::Path(std::string unverified_path)
{
if (unverified_path.empty())
return;
- if (this->is_valid())
+ if (this->isValid())
return;
// oops, not valid.
path.clear();
@@ -40,28 +40,28 @@ Path::Path(std::string unverified_path)
Path
Path::GetRootDirectory() {
Path result;
- result.set_directory("/");
+ result.setDirectory("/");
return result;
}
static inline bool IsLibrary(Path& path, const std::string& basename) {
- if (path.append_file(std::string("lib") + basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ if (path.appendFile(std::string("lib") + basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
- } else if (path.elide_file() && path.append_file(basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ } else if (path.elideFile() && path.appendFile(basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
}
path.clear();
@@ -76,20 +76,20 @@ Path::GetLibraryPath(const std::string& basename,
// Try the paths provided
for (std::vector<std::string>::const_iterator I = LibPaths.begin(),
E = LibPaths.end(); I != E; ++I ) {
- if (result.set_directory(*I) && IsLibrary(result,basename))
+ if (result.setDirectory(*I) && IsLibrary(result,basename))
return result;
}
// Try the LLVM lib directory in the LLVM install area
- if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+ if (result.setDirectory(LLVM_LIBDIR) && IsLibrary(result,basename))
return result;
// Try /usr/lib
- if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/usr/lib/") && IsLibrary(result,basename))
return result;
// Try /lib
- if (result.set_directory("/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/lib/") && IsLibrary(result,basename))
return result;
// Can't find it, give up and return invalid path.
@@ -115,7 +115,7 @@ Path::GetLLVMDefaultConfigDir() {
Path
Path::GetLLVMConfigDir() {
Path result;
- if (result.set_directory(LLVM_ETCDIR))
+ if (result.setDirectory(LLVM_ETCDIR))
return result;
return GetLLVMDefaultConfigDir();
}
@@ -125,24 +125,24 @@ Path::GetUserHomeDirectory() {
const char* home = getenv("HOME");
if (home) {
Path result;
- if (result.set_directory(home))
+ if (result.setDirectory(home))
return result;
}
return GetRootDirectory();
}
bool
-Path::is_file() const {
- return (is_valid() && path[path.length()-1] != '/');
+Path::isFile() const {
+ return (isValid() && path[path.length()-1] != '/');
}
bool
-Path::is_directory() const {
- return (is_valid() && path[path.length()-1] == '/');
+Path::isDirectory() const {
+ return (isValid() && path[path.length()-1] == '/');
}
std::string
-Path::get_basename() const {
+Path::getBasename() const {
// Find the last slash
size_t slash = path.rfind('/');
if (slash == std::string::npos)
@@ -153,7 +153,7 @@ Path::get_basename() const {
return path.substr(slash, path.rfind('.'));
}
-bool Path::has_magic_number(const std::string &Magic) const {
+bool Path::hasMagicNumber(const std::string &Magic) const {
size_t len = Magic.size();
char buf[ 1 + len];
std::ifstream f(path.c_str());
@@ -163,17 +163,17 @@ bool Path::has_magic_number(const std::string &Magic) const {
}
bool
-Path::is_bytecode_file() const {
+Path::isBytecodeFile() const {
if (readable()) {
- return has_magic_number("llvm");
+ return hasMagicNumber("llvm");
}
return false;
}
bool
-Path::is_archive() const {
+Path::isArchive() const {
if (readable()) {
- return has_magic_number("!<arch>\012");
+ return hasMagicNumber("!<arch>\012");
}
return false;
}
@@ -221,7 +221,7 @@ Path::getLast() const {
}
bool
-Path::set_directory(const std::string& a_path) {
+Path::setDirectory(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -229,7 +229,7 @@ Path::set_directory(const std::string& a_path) {
size_t last = a_path.size() -1;
if (last != 0 && a_path[last] != '/')
path += '/';
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -237,7 +237,7 @@ Path::set_directory(const std::string& a_path) {
}
bool
-Path::set_file(const std::string& a_path) {
+Path::setFile(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -246,7 +246,7 @@ Path::set_file(const std::string& a_path) {
while (last > 0 && a_path[last] == '/')
last--;
path.erase(last+1);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -254,13 +254,13 @@ Path::set_file(const std::string& a_path) {
}
bool
-Path::append_directory(const std::string& dir) {
- if (is_file())
+Path::appendDirectory(const std::string& dir) {
+ if (isFile())
return false;
Path save(*this);
path += dir;
path += "/";
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -268,8 +268,8 @@ Path::append_directory(const std::string& dir) {
}
bool
-Path::elide_directory() {
- if (is_file())
+Path::elideDirectory() {
+ if (isFile())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == 0 || slashpos == std::string::npos)
@@ -283,12 +283,12 @@ Path::elide_directory() {
}
bool
-Path::append_file(const std::string& file) {
- if (!is_directory())
+Path::appendFile(const std::string& file) {
+ if (!isDirectory())
return false;
Path save(*this);
path += file;
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -296,8 +296,8 @@ Path::append_file(const std::string& file) {
}
bool
-Path::elide_file() {
- if (is_directory())
+Path::elideFile() {
+ if (isDirectory())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == std::string::npos)
@@ -307,13 +307,13 @@ Path::elide_file() {
}
bool
-Path::append_suffix(const std::string& suffix) {
- if (is_directory())
+Path::appendSuffix(const std::string& suffix) {
+ if (isDirectory())
return false;
Path save(*this);
path.append(".");
path.append(suffix);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -321,8 +321,8 @@ Path::append_suffix(const std::string& suffix) {
}
bool
-Path::elide_suffix() {
- if (is_directory()) return false;
+Path::elideSuffix() {
+ if (isDirectory()) return false;
size_t dotpos = path.rfind('.',path.size());
size_t slashpos = path.rfind('/',path.size());
if (slashpos != std::string::npos && dotpos != std::string::npos &&
@@ -335,9 +335,9 @@ Path::elide_suffix() {
bool
-Path::create_directory( bool create_parents) {
+Path::createDirectory( bool create_parents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// Get a writeable copy of the path name
char pathname[MAXPATHLEN];
@@ -372,9 +372,9 @@ Path::create_directory( bool create_parents) {
}
bool
-Path::create_file() {
+Path::createFile() {
// Make sure we're dealing with a file
- if (!is_file()) return false;
+ if (!isFile()) return false;
// Create the file
int fd = ::creat(path.c_str(), S_IRUSR | S_IWUSR);
@@ -386,9 +386,9 @@ Path::create_file() {
}
bool
-Path::destroy_directory(bool remove_contents) {
+Path::destroyDirectory(bool remove_contents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// If it doesn't exist, we're done.
if (!exists()) return true;
@@ -412,8 +412,8 @@ Path::destroy_directory(bool remove_contents) {
}
bool
-Path::destroy_file() {
- if (!is_file()) return false;
+Path::destroyFile() {
+ if (!isFile()) return false;
if (0 != unlink(path.c_str()))
ThrowErrno(std::string(path.c_str()) + ": Can't destroy file");
return true;
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index c9333decbfd..4f4d347f092 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -30,7 +30,7 @@ Path::Path(std::string unverified_path)
{
if (unverified_path.empty())
return;
- if (this->is_valid())
+ if (this->isValid())
return;
// oops, not valid.
path.clear();
@@ -40,28 +40,28 @@ Path::Path(std::string unverified_path)
Path
Path::GetRootDirectory() {
Path result;
- result.set_directory("/");
+ result.setDirectory("/");
return result;
}
static inline bool IsLibrary(Path& path, const std::string& basename) {
- if (path.append_file(std::string("lib") + basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ if (path.appendFile(std::string("lib") + basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
- } else if (path.elide_file() && path.append_file(basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ } else if (path.elideFile() && path.appendFile(basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
}
path.clear();
@@ -76,20 +76,20 @@ Path::GetLibraryPath(const std::string& basename,
// Try the paths provided
for (std::vector<std::string>::const_iterator I = LibPaths.begin(),
E = LibPaths.end(); I != E; ++I ) {
- if (result.set_directory(*I) && IsLibrary(result,basename))
+ if (result.setDirectory(*I) && IsLibrary(result,basename))
return result;
}
// Try the LLVM lib directory in the LLVM install area
- if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+ if (result.setDirectory(LLVM_LIBDIR) && IsLibrary(result,basename))
return result;
// Try /usr/lib
- if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/usr/lib/") && IsLibrary(result,basename))
return result;
// Try /lib
- if (result.set_directory("/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/lib/") && IsLibrary(result,basename))
return result;
// Can't find it, give up and return invalid path.
@@ -115,7 +115,7 @@ Path::GetLLVMDefaultConfigDir() {
Path
Path::GetLLVMConfigDir() {
Path result;
- if (result.set_directory(LLVM_ETCDIR))
+ if (result.setDirectory(LLVM_ETCDIR))
return result;
return GetLLVMDefaultConfigDir();
}
@@ -125,24 +125,24 @@ Path::GetUserHomeDirectory() {
const char* home = getenv("HOME");
if (home) {
Path result;
- if (result.set_directory(home))
+ if (result.setDirectory(home))
return result;
}
return GetRootDirectory();
}
bool
-Path::is_file() const {
- return (is_valid() && path[path.length()-1] != '/');
+Path::isFile() const {
+ return (isValid() && path[path.length()-1] != '/');
}
bool
-Path::is_directory() const {
- return (is_valid() && path[path.length()-1] == '/');
+Path::isDirectory() const {
+ return (isValid() && path[path.length()-1] == '/');
}
std::string
-Path::get_basename() const {
+Path::getBasename() const {
// Find the last slash
size_t slash = path.rfind('/');
if (slash == std::string::npos)
@@ -153,7 +153,7 @@ Path::get_basename() const {
return path.substr(slash, path.rfind('.'));
}
-bool Path::has_magic_number(const std::string &Magic) const {
+bool Path::hasMagicNumber(const std::string &Magic) const {
size_t len = Magic.size();
char buf[ 1 + len];
std::ifstream f(path.c_str());
@@ -163,17 +163,17 @@ bool Path::has_magic_number(const std::string &Magic) const {
}
bool
-Path::is_bytecode_file() const {
+Path::isBytecodeFile() const {
if (readable()) {
- return has_magic_number("llvm");
+ return hasMagicNumber("llvm");
}
return false;
}
bool
-Path::is_archive() const {
+Path::isArchive() const {
if (readable()) {
- return has_magic_number("!<arch>\012");
+ return hasMagicNumber("!<arch>\012");
}
return false;
}
@@ -221,7 +221,7 @@ Path::getLast() const {
}
bool
-Path::set_directory(const std::string& a_path) {
+Path::setDirectory(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -229,7 +229,7 @@ Path::set_directory(const std::string& a_path) {
size_t last = a_path.size() -1;
if (last != 0 && a_path[last] != '/')
path += '/';
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -237,7 +237,7 @@ Path::set_directory(const std::string& a_path) {
}
bool
-Path::set_file(const std::string& a_path) {
+Path::setFile(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -246,7 +246,7 @@ Path::set_file(const std::string& a_path) {
while (last > 0 && a_path[last] == '/')
last--;
path.erase(last+1);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -254,13 +254,13 @@ Path::set_file(const std::string& a_path) {
}
bool
-Path::append_directory(const std::string& dir) {
- if (is_file())
+Path::appendDirectory(const std::string& dir) {
+ if (isFile())
return false;
Path save(*this);
path += dir;
path += "/";
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -268,8 +268,8 @@ Path::append_directory(const std::string& dir) {
}
bool
-Path::elide_directory() {
- if (is_file())
+Path::elideDirectory() {
+ if (isFile())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == 0 || slashpos == std::string::npos)
@@ -283,12 +283,12 @@ Path::elide_directory() {
}
bool
-Path::append_file(const std::string& file) {
- if (!is_directory())
+Path::appendFile(const std::string& file) {
+ if (!isDirectory())
return false;
Path save(*this);
path += file;
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -296,8 +296,8 @@ Path::append_file(const std::string& file) {
}
bool
-Path::elide_file() {
- if (is_directory())
+Path::elideFile() {
+ if (isDirectory())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == std::string::npos)
@@ -307,13 +307,13 @@ Path::elide_file() {
}
bool
-Path::append_suffix(const std::string& suffix) {
- if (is_directory())
+Path::appendSuffix(const std::string& suffix) {
+ if (isDirectory())
return false;
Path save(*this);
path.append(".");
path.append(suffix);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -321,8 +321,8 @@ Path::append_suffix(const std::string& suffix) {
}
bool
-Path::elide_suffix() {
- if (is_directory()) return false;
+Path::elideSuffix() {
+ if (isDirectory()) return false;
size_t dotpos = path.rfind('.',path.size());
size_t slashpos = path.rfind('/',path.size());
if (slashpos != std::string::npos && dotpos != std::string::npos &&
@@ -335,9 +335,9 @@ Path::elide_suffix() {
bool
-Path::create_directory( bool create_parents) {
+Path::createDirectory( bool create_parents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// Get a writeable copy of the path name
char pathname[MAXPATHLEN];
@@ -372,9 +372,9 @@ Path::create_directory( bool create_parents) {
}
bool
-Path::create_file() {
+Path::createFile() {
// Make sure we're dealing with a file
- if (!is_file()) return false;
+ if (!isFile()) return false;
// Create the file
int fd = ::creat(path.c_str(), S_IRUSR | S_IWUSR);
@@ -386,9 +386,9 @@ Path::create_file() {
}
bool
-Path::destroy_directory(bool remove_contents) {
+Path::destroyDirectory(bool remove_contents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// If it doesn't exist, we're done.
if (!exists()) return true;
@@ -412,8 +412,8 @@ Path::destroy_directory(bool remove_contents) {
}
bool
-Path::destroy_file() {
- if (!is_file()) return false;
+Path::destroyFile() {
+ if (!isFile()) return false;
if (0 != unlink(path.c_str()))
ThrowErrno(std::string(path.c_str()) + ": Can't destroy file");
return true;
diff --git a/lib/System/Unix/Program.cpp b/lib/System/Unix/Program.cpp
index 27f39dfd54d..18fcafeb4ea 100644
--- a/lib/System/Unix/Program.cpp
+++ b/lib/System/Unix/Program.cpp
@@ -37,7 +37,7 @@ Program::FindProgramByName(const std::string& progName) {
if (progName.length() == 0) // no program
return Path();
Path temp;
- if (!temp.set_file(progName)) // invalid name
+ if (!temp.setFile(progName)) // invalid name
return Path();
if (temp.executable()) // already executable as is
return temp;
@@ -57,8 +57,8 @@ Program::FindProgramByName(const std::string& progName) {
// Check to see if this first directory contains the executable...
Path FilePath;
- if (FilePath.set_directory(std::string(PathStr,Colon))) {
- FilePath.append_file(progName);
+ if (FilePath.setDirectory(std::string(PathStr,Colon))) {
+ FilePath.appendFile(progName);
if (FilePath.executable())
return FilePath; // Found the executable!
}
diff --git a/lib/System/Unix/Program.inc b/lib/System/Unix/Program.inc
index 27f39dfd54d..18fcafeb4ea 100644
--- a/lib/System/Unix/Program.inc
+++ b/lib/System/Unix/Program.inc
@@ -37,7 +37,7 @@ Program::FindProgramByName(const std::string& progName) {
if (progName.length() == 0) // no program
return Path();
Path temp;
- if (!temp.set_file(progName)) // invalid name
+ if (!temp.setFile(progName)) // invalid name
return Path();
if (temp.executable()) // already executable as is
return temp;
@@ -57,8 +57,8 @@ Program::FindProgramByName(const std::string& progName) {
// Check to see if this first directory contains the executable...
Path FilePath;
- if (FilePath.set_directory(std::string(PathStr,Colon))) {
- FilePath.append_file(progName);
+ if (FilePath.setDirectory(std::string(PathStr,Colon))) {
+ FilePath.appendFile(progName);
if (FilePath.executable())
return FilePath; // Found the executable!
}
diff --git a/lib/System/Unix/Signals.cpp b/lib/System/Unix/Signals.cpp
index 445fec74f7b..14793cf1210 100644
--- a/lib/System/Unix/Signals.cpp
+++ b/lib/System/Unix/Signals.cpp
@@ -111,7 +111,7 @@ RETSIGTYPE SignalHandler(int Sig) {
if (DirectoriesToRemove != 0)
while (!DirectoriesToRemove->empty()) {
- DirectoriesToRemove->back().destroy_directory(true);
+ DirectoriesToRemove->back().destroyDirectory(true);
DirectoriesToRemove->pop_back();
}
@@ -146,7 +146,7 @@ void sys::RemoveFileOnSignal(const std::string &Filename) {
// RemoveDirectoryOnSignal - The public API
void sys::RemoveDirectoryOnSignal(const llvm::sys::Path& path) {
- if (!path.is_directory())
+ if (!path.isDirectory())
return;
if (DirectoriesToRemove == 0)
diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc
index 445fec74f7b..14793cf1210 100644
--- a/lib/System/Unix/Signals.inc
+++ b/lib/System/Unix/Signals.inc
@@ -111,7 +111,7 @@ RETSIGTYPE SignalHandler(int Sig) {
if (DirectoriesToRemove != 0)
while (!DirectoriesToRemove->empty()) {
- DirectoriesToRemove->back().destroy_directory(true);
+ DirectoriesToRemove->back().destroyDirectory(true);
DirectoriesToRemove->pop_back();
}
@@ -146,7 +146,7 @@ void sys::RemoveFileOnSignal(const std::string &Filename) {
// RemoveDirectoryOnSignal - The public API
void sys::RemoveDirectoryOnSignal(const llvm::sys::Path& path) {
- if (!path.is_directory())
+ if (!path.isDirectory())
return;
if (DirectoriesToRemove == 0)
diff --git a/lib/System/Win32/Path.cpp b/lib/System/Win32/Path.cpp
index 17d722beedf..e22b0354b7e 100644
--- a/lib/System/Win32/Path.cpp
+++ b/lib/System/Win32/Path.cpp
@@ -34,7 +34,7 @@ namespace llvm {
namespace sys {
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
@@ -81,19 +81,19 @@ Path::GetTemporaryDirectory() {
throw std::string("Can't determine temporary directory");
Path result;
- result.set_directory(pathname);
+ result.setDirectory(pathname);
// Append a subdirectory passed on our process id so multiple LLVMs don't
// step on each other's toes.
sprintf(pathname, "LLVM_%u", GetCurrentProcessId());
- result.append_directory(pathname);
+ result.appendDirectory(pathname);
// If there's a directory left over from a previous LLVM execution that
// happened to have the same process id, get rid of it.
- result.destroy_directory(true);
+ result.destroyDirectory(true);
// And finally (re-)create the empty directory.
- result.create_directory(false);
+ result.createDirectory(false);
TempDirectory = new Path(result);
return *TempDirectory;
}
@@ -104,7 +104,7 @@ Path::Path(std::string unverified_path)
FlipBackSlashes(path);
if (unverified_path.empty())
return;
- if (this->is_valid())
+ if (this->isValid())
return;
// oops, not valid.
path.clear();
@@ -115,7 +115,7 @@ Path::Path(std::string unverified_path)
Path
Path::GetRootDirectory() {
Path result;
- result.set_directory("/");
+ result.setDirectory("/");
return result;
}
@@ -125,23 +125,23 @@ Path::GetDLLSuffix() {
}
static inline bool IsLibrary(Path& path, const std::string& basename) {
- if (path.append_file(std::string("lib") + basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ if (path.appendFile(std::string("lib") + basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
- } else if (path.elide_file() && path.append_file(basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ } else if (path.elideFile() && path.appendFile(basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
}
path.clear();
@@ -156,20 +156,20 @@ Path::GetLibraryPath(const std::string& basename,
// Try the paths provided
for (std::vector<std::string>::const_iterator I = LibPaths.begin(),
E = LibPaths.end(); I != E; ++I ) {
- if (result.set_directory(*I) && IsLibrary(result,basename))
+ if (result.setDirectory(*I) && IsLibrary(result,basename))
return result;
}
// Try the LLVM lib directory in the LLVM install area
- //if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+ //if (result.setDirectory(LLVM_LIBDIR) && IsLibrary(result,basename))
// return result;
// Try /usr/lib
- if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/usr/lib/") && IsLibrary(result,basename))
return result;
// Try /lib
- if (result.set_directory("/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/lib/") && IsLibrary(result,basename))
return result;
// Can't find it, give up and return invalid path.
@@ -202,7 +202,7 @@ Path::GetUserHomeDirectory() {
const char* home = getenv("HOME");
if (home) {
Path result;
- if (result.set_directory(home))
+ if (result.setDirectory(home))
return result;
}
return GetRootDirectory();
@@ -210,17 +210,17 @@ Path::GetUserHomeDirectory() {
// FIXME: the above set of functions don't map to Windows very well.
bool
-Path::is_file() const {
- return (is_valid() && path[path.length()-1] != '/');
+Path::isFile() const {
+ return (isValid() && path[path.length()-1] != '/');
}
bool
-Path::is_directory() const {
- return (is_valid() && path[path.length()-1] == '/');
+Path::isDirectory() const {
+ return (isValid() && path[path.length()-1] == '/');
}
std::string
-Path::get_basename() const {
+Path::getBasename() const {
// Find the last slash
size_t slash = path.rfind('/');
if (slash == std::string::npos)
@@ -231,7 +231,7 @@ Path::get_basename() const {
return path.substr(slash, path.rfind('.'));
}
-bool Path::has_magic_number(const std::string &Magic) const {
+bool Path::hasMagicNumber(const std::string &Magic) const {
size_t len = Magic.size();
char *buf = reinterpret_cast<char *>(_alloca(len+1));
std::ifstream f(path.c_str());
@@ -241,17 +241,17 @@ bool Path::has_magic_number(const std::string &Magic) const {
}
bool
-Path::is_bytecode_file() const {
+Path::isBytecodeFile() const {
if (readable()) {
- return has_magic_number("llvm");
+ return hasMagicNumber("llvm");
}
return false;
}
bool
-Path::is_archive() const {
+Path::isArchive() const {
if (readable()) {
- return has_magic_number("!<arch>\012");
+ return hasMagicNumber("!<arch>\012");
}
return false;
}
@@ -306,7 +306,7 @@ Path::getLast() const {
}
bool
-Path::set_directory(const std::string& a_path) {
+Path::setDirectory(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -315,7 +315,7 @@ Path::set_directory(const std::string& a_path) {
size_t last = a_path.size() -1;
if (last != 0 && a_path[last] != '/')
path += '/';
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -323,7 +323,7 @@ Path::set_directory(const std::string& a_path) {
}
bool
-Path::set_file(const std::string& a_path) {
+Path::setFile(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -333,7 +333,7 @@ Path::set_file(const std::string& a_path) {
while (last > 0 && a_path[last] == '/')
last--;
path.erase(last+1);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -341,13 +341,13 @@ Path::set_file(const std::string& a_path) {
}
bool
-Path::append_directory(const std::string& dir) {
- if (is_file())
+Path::appendDirectory(const std::string& dir) {
+ if (isFile())
return false;
Path save(*this);
path += dir;
path += "/";
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -355,8 +355,8 @@ Path::append_directory(const std::string& dir) {
}
bool
-Path::elide_directory() {
- if (is_file())
+Path::elideDirectory() {
+ if (isFile())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == 0 || slashpos == std::string::npos)
@@ -370,12 +370,12 @@ Path::elide_directory() {
}
bool
-Path::append_file(const std::string& file) {
- if (!is_directory())
+Path::appendFile(const std::string& file) {
+ if (!isDirectory())
return false;
Path save(*this);
path += file;
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -383,8 +383,8 @@ Path::append_file(const std::string& file) {
}
bool
-Path::elide_file() {
- if (is_directory())
+Path::elideFile() {
+ if (isDirectory())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == std::string::npos)
@@ -394,13 +394,13 @@ Path::elide_file() {
}
bool
-Path::append_suffix(const std::string& suffix) {
- if (is_directory())
+Path::appendSuffix(const std::string& suffix) {
+ if (isDirectory())
return false;
Path save(*this);
path.append(".");
path.append(suffix);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -408,8 +408,8 @@ Path::append_suffix(const std::string& suffix) {
}
bool
-Path::elide_suffix() {
- if (is_directory()) return false;
+Path::elideSuffix() {
+ if (isDirectory()) return false;
size_t dotpos = path.rfind('.',path.size());
size_t slashpos = path.rfind('/',path.size());
if (slashpos != std::string::npos && dotpos != std::string::npos &&
@@ -422,9 +422,9 @@ Path::elide_suffix() {
bool
-Path::create_directory( bool create_parents) {
+Path::createDirectory( bool create_parents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// Get a writeable copy of the path name
char *pathname = reinterpret_cast<char *>(_alloca(path.length()+1));
@@ -473,9 +473,9 @@ Path::create_directory( bool create_parents) {
}
bool
-Path::create_file() {
+Path::createFile() {
// Make sure we're dealing with a file
- if (!is_file()) return false;
+ if (!isFile()) return false;
// Create the file
HANDLE h = CreateFile(path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_NEW,
@@ -488,9 +488,9 @@ Path::create_file() {
}
bool
-Path::destroy_directory(bool remove_contents) {
+Path::destroyDirectory(bool remove_contents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// If it doesn't exist, we're done.
if (!exists()) return true;
@@ -517,8 +517,8 @@ Path::destroy_directory(bool remove_contents) {
}
bool
-Path::destroy_file() {
- if (!is_file()) return false;
+Path::destroyFile() {
+ if (!isFile()) return false;
DWORD attr = GetFileAttributes(path.c_str());
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 17d722beedf..e22b0354b7e 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -34,7 +34,7 @@ namespace llvm {
namespace sys {
bool
-Path::is_valid() const {
+Path::isValid() const {
if (path.empty())
return false;
@@ -81,19 +81,19 @@ Path::GetTemporaryDirectory() {
throw std::string("Can't determine temporary directory");
Path result;
- result.set_directory(pathname);
+ result.setDirectory(pathname);
// Append a subdirectory passed on our process id so multiple LLVMs don't
// step on each other's toes.
sprintf(pathname, "LLVM_%u", GetCurrentProcessId());
- result.append_directory(pathname);
+ result.appendDirectory(pathname);
// If there's a directory left over from a previous LLVM execution that
// happened to have the same process id, get rid of it.
- result.destroy_directory(true);
+ result.destroyDirectory(true);
// And finally (re-)create the empty directory.
- result.create_directory(false);
+ result.createDirectory(false);
TempDirectory = new Path(result);
return *TempDirectory;
}
@@ -104,7 +104,7 @@ Path::Path(std::string unverified_path)
FlipBackSlashes(path);
if (unverified_path.empty())
return;
- if (this->is_valid())
+ if (this->isValid())
return;
// oops, not valid.
path.clear();
@@ -115,7 +115,7 @@ Path::Path(std::string unverified_path)
Path
Path::GetRootDirectory() {
Path result;
- result.set_directory("/");
+ result.setDirectory("/");
return result;
}
@@ -125,23 +125,23 @@ Path::GetDLLSuffix() {
}
static inline bool IsLibrary(Path& path, const std::string& basename) {
- if (path.append_file(std::string("lib") + basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ if (path.appendFile(std::string("lib") + basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
- } else if (path.elide_file() && path.append_file(basename)) {
- if (path.append_suffix(Path::GetDLLSuffix()) && path.readable())
+ } else if (path.elideFile() && path.appendFile(basename)) {
+ if (path.appendSuffix(Path::GetDLLSuffix()) && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("a") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("a") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("o") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("o") && path.readable())
return true;
- else if (path.elide_suffix() && path.append_suffix("bc") && path.readable())
+ else if (path.elideSuffix() && path.appendSuffix("bc") && path.readable())
return true;
}
path.clear();
@@ -156,20 +156,20 @@ Path::GetLibraryPath(const std::string& basename,
// Try the paths provided
for (std::vector<std::string>::const_iterator I = LibPaths.begin(),
E = LibPaths.end(); I != E; ++I ) {
- if (result.set_directory(*I) && IsLibrary(result,basename))
+ if (result.setDirectory(*I) && IsLibrary(result,basename))
return result;
}
// Try the LLVM lib directory in the LLVM install area
- //if (result.set_directory(LLVM_LIBDIR) && IsLibrary(result,basename))
+ //if (result.setDirectory(LLVM_LIBDIR) && IsLibrary(result,basename))
// return result;
// Try /usr/lib
- if (result.set_directory("/usr/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/usr/lib/") && IsLibrary(result,basename))
return result;
// Try /lib
- if (result.set_directory("/lib/") && IsLibrary(result,basename))
+ if (result.setDirectory("/lib/") && IsLibrary(result,basename))
return result;
// Can't find it, give up and return invalid path.
@@ -202,7 +202,7 @@ Path::GetUserHomeDirectory() {
const char* home = getenv("HOME");
if (home) {
Path result;
- if (result.set_directory(home))
+ if (result.setDirectory(home))
return result;
}
return GetRootDirectory();
@@ -210,17 +210,17 @@ Path::GetUserHomeDirectory() {
// FIXME: the above set of functions don't map to Windows very well.
bool
-Path::is_file() const {
- return (is_valid() && path[path.length()-1] != '/');
+Path::isFile() const {
+ return (isValid() && path[path.length()-1] != '/');
}
bool
-Path::is_directory() const {
- return (is_valid() && path[path.length()-1] == '/');
+Path::isDirectory() const {
+ return (isValid() && path[path.length()-1] == '/');
}
std::string
-Path::get_basename() const {
+Path::getBasename() const {
// Find the last slash
size_t slash = path.rfind('/');
if (slash == std::string::npos)
@@ -231,7 +231,7 @@ Path::get_basename() const {
return path.substr(slash, path.rfind('.'));
}
-bool Path::has_magic_number(const std::string &Magic) const {
+bool Path::hasMagicNumber(const std::string &Magic) const {
size_t len = Magic.size();
char *buf = reinterpret_cast<char *>(_alloca(len+1));
std::ifstream f(path.c_str());
@@ -241,17 +241,17 @@ bool Path::has_magic_number(const std::string &Magic) const {
}
bool
-Path::is_bytecode_file() const {
+Path::isBytecodeFile() const {
if (readable()) {
- return has_magic_number("llvm");
+ return hasMagicNumber("llvm");
}
return false;
}
bool
-Path::is_archive() const {
+Path::isArchive() const {
if (readable()) {
- return has_magic_number("!<arch>\012");
+ return hasMagicNumber("!<arch>\012");
}
return false;
}
@@ -306,7 +306,7 @@ Path::getLast() const {
}
bool
-Path::set_directory(const std::string& a_path) {
+Path::setDirectory(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -315,7 +315,7 @@ Path::set_directory(const std::string& a_path) {
size_t last = a_path.size() -1;
if (last != 0 && a_path[last] != '/')
path += '/';
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -323,7 +323,7 @@ Path::set_directory(const std::string& a_path) {
}
bool
-Path::set_file(const std::string& a_path) {
+Path::setFile(const std::string& a_path) {
if (a_path.size() == 0)
return false;
Path save(*this);
@@ -333,7 +333,7 @@ Path::set_file(const std::string& a_path) {
while (last > 0 && a_path[last] == '/')
last--;
path.erase(last+1);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -341,13 +341,13 @@ Path::set_file(const std::string& a_path) {
}
bool
-Path::append_directory(const std::string& dir) {
- if (is_file())
+Path::appendDirectory(const std::string& dir) {
+ if (isFile())
return false;
Path save(*this);
path += dir;
path += "/";
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -355,8 +355,8 @@ Path::append_directory(const std::string& dir) {
}
bool
-Path::elide_directory() {
- if (is_file())
+Path::elideDirectory() {
+ if (isFile())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == 0 || slashpos == std::string::npos)
@@ -370,12 +370,12 @@ Path::elide_directory() {
}
bool
-Path::append_file(const std::string& file) {
- if (!is_directory())
+Path::appendFile(const std::string& file) {
+ if (!isDirectory())
return false;
Path save(*this);
path += file;
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -383,8 +383,8 @@ Path::append_file(const std::string& file) {
}
bool
-Path::elide_file() {
- if (is_directory())
+Path::elideFile() {
+ if (isDirectory())
return false;
size_t slashpos = path.rfind('/',path.size());
if (slashpos == std::string::npos)
@@ -394,13 +394,13 @@ Path::elide_file() {
}
bool
-Path::append_suffix(const std::string& suffix) {
- if (is_directory())
+Path::appendSuffix(const std::string& suffix) {
+ if (isDirectory())
return false;
Path save(*this);
path.append(".");
path.append(suffix);
- if (!is_valid()) {
+ if (!isValid()) {
path = save.path;
return false;
}
@@ -408,8 +408,8 @@ Path::append_suffix(const std::string& suffix) {
}
bool
-Path::elide_suffix() {
- if (is_directory()) return false;
+Path::elideSuffix() {
+ if (isDirectory()) return false;
size_t dotpos = path.rfind('.',path.size());
size_t slashpos = path.rfind('/',path.size());
if (slashpos != std::string::npos && dotpos != std::string::npos &&
@@ -422,9 +422,9 @@ Path::elide_suffix() {
bool
-Path::create_directory( bool create_parents) {
+Path::createDirectory( bool create_parents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// Get a writeable copy of the path name
char *pathname = reinterpret_cast<char *>(_alloca(path.length()+1));
@@ -473,9 +473,9 @@ Path::create_directory( bool create_parents) {
}
bool
-Path::create_file() {
+Path::createFile() {
// Make sure we're dealing with a file
- if (!is_file()) return false;
+ if (!isFile()) return false;
// Create the file
HANDLE h = CreateFile(path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_NEW,
@@ -488,9 +488,9 @@ Path::create_file() {
}
bool
-Path::destroy_directory(bool remove_contents) {
+Path::destroyDirectory(bool remove_contents) {
// Make sure we're dealing with a directory
- if (!is_directory()) return false;
+ if (!isDirectory()) return false;
// If it doesn't exist, we're done.
if (!exists()) return true;
@@ -517,8 +517,8 @@ Path::destroy_directory(bool remove_contents) {
}
bool
-Path::destroy_file() {
- if (!is_file()) return false;
+Path::destroyFile() {
+ if (!isFile()) return false;
DWORD attr = GetFileAttributes(path.c_str());
diff --git a/lib/System/Win32/Program.cpp b/lib/System/Win32/Program.cpp
index a83f0e84f8e..0078fb76628 100644
--- a/lib/System/Win32/Program.cpp
+++ b/lib/System/Win32/Program.cpp
@@ -32,7 +32,7 @@ Program::FindProgramByName(const std::string& progName) {
if (progName.length() == 0) // no program
return Path();
Path temp;
- if (!temp.set_file(progName)) // invalid name
+ if (!temp.setFile(progName)) // invalid name
return Path();
if (temp.executable()) // already executable as is
return temp;
diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index a83f0e84f8e..0078fb76628 100644
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -32,7 +32,7 @@ Program::FindProgramByName(const std::string& progName) {
if (progName.length() == 0) // no program
return Path();
Path temp;
- if (!temp.set_file(progName)) // invalid name
+ if (!temp.setFile(progName)) // invalid name
return Path();
if (temp.executable()) // already executable as is
return temp;
diff --git a/lib/System/Win32/Signals.cpp b/lib/System/Win32/Signals.cpp
index 5c6e0087f4e..262c240b3e4 100644
--- a/lib/System/Win32/Signals.cpp
+++ b/lib/System/Win32/Signals.cpp
@@ -93,7 +93,7 @@ void sys::RemoveDirectoryOnSignal(const sys::Path& path) {
if (CleanupExecuted)
throw std::string("Process terminating -- cannot register for removal");
- if (path.is_directory()) {
+ if (path.isDirectory()) {
if (DirectoriesToRemove == NULL)
DirectoriesToRemove = new std::vector<sys::Path>;
@@ -124,7 +124,7 @@ static void Cleanup() {
if (FilesToRemove != NULL)
while (!FilesToRemove->empty()) {
try {
- FilesToRemove->back().destroy_file();
+ FilesToRemove->back().destroyFile();
} catch (...) {
}
FilesToRemove->pop_back();
@@ -133,7 +133,7 @@ static void Cleanup() {
if (DirectoriesToRemove != NULL)
while (!DirectoriesToRemove->empty()) {
try {
- DirectoriesToRemove->back().destroy_directory(true);
+ DirectoriesToRemove->back().destroyDirectory(true);
} catch (...) {
}
DirectoriesToRemove->pop_back();
diff --git a/lib/System/Win32/Signals.inc b/lib/System/Win32/Signals.inc
index 5c6e0087f4e..262c240b3e4 100644
--- a/lib/System/Win32/Signals.inc
+++ b/lib/System/Win32/Signals.inc
@@ -93,7 +93,7 @@ void sys::RemoveDirectoryOnSignal(const sys::Path& path) {
if (CleanupExecuted)
throw std::string("Process terminating -- cannot register for removal");
- if (path.is_directory()) {
+ if (path.isDirectory()) {
if (DirectoriesToRemove == NULL)
DirectoriesToRemove = new std::vector<sys::Path>;
@@ -124,7 +124,7 @@ static void Cleanup() {
if (FilesToRemove != NULL)
while (!FilesToRemove->empty()) {
try {
- FilesToRemove->back().destroy_file();
+ FilesToRemove->back().destroyFile();
} catch (...) {
}
FilesToRemove->pop_back();
@@ -133,7 +133,7 @@ static void Cleanup() {
if (DirectoriesToRemove != NULL)
while (!DirectoriesToRemove->empty()) {
try {
- DirectoriesToRemove->back().destroy_directory(true);
+ DirectoriesToRemove->back().destroyDirectory(true);
} catch (...) {
}
DirectoriesToRemove->pop_back();
diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp
index fbf09781bae..a07caf3b696 100644
--- a/lib/VMCore/Linker.cpp
+++ b/lib/VMCore/Linker.cpp
@@ -946,9 +946,9 @@ bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
// If the source library's module id is in the dependent library list of the
// destination library, remove it since that module is now linked in.
sys::Path modId;
- modId.set_file(Src->getModuleIdentifier());
- if (!modId.is_empty())
- Dest->removeLibrary(modId.get_basename());
+ modId.setFile(Src->getModuleIdentifier());
+ if (!modId.isEmpty())
+ Dest->removeLibrary(modId.getBasename());
return false;
}