[llvm-commits] CVS: llvm/lib/System/Win32/Path.cpp Program.cpp Signals.cpp

Reid Spencer reid at x10sys.com
Fri Nov 5 16:15:49 CST 2004



Changes in directory llvm/lib/System/Win32:

Path.cpp updated: 1.4 -> 1.5
Program.cpp updated: 1.2 -> 1.3
Signals.cpp updated: 1.9 -> 1.10
---
Log message:

Stop propagating method names that violate the coding standard

---
Diffs of the changes:  (+63 -63)

Index: llvm/lib/System/Win32/Path.cpp
diff -u llvm/lib/System/Win32/Path.cpp:1.4 llvm/lib/System/Win32/Path.cpp:1.5
--- llvm/lib/System/Win32/Path.cpp:1.4	Tue Sep 28 19:01:17 2004
+++ llvm/lib/System/Win32/Path.cpp	Fri Nov  5 16:15:36 2004
@@ -34,7 +34,7 @@
 namespace sys {
 
 bool
-Path::is_valid() const {
+Path::isValid() const {
   if (path.empty())
     return false;
 
@@ -81,19 +81,19 @@
     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 @@
   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::GetRootDirectory() {
   Path result;
-  result.set_directory("/");
+  result.setDirectory("/");
   return result;
 }
 
@@ -125,23 +125,23 @@
 }
 
 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 @@
   // 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 @@
   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 @@
 // 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 @@
   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::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 @@
 }
 
 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 @@
   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 @@
 }
 
 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 @@
   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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 
 
 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 @@
 }
 
 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 @@
 }
 
 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 @@
 }
 
 bool
-Path::destroy_file() {
-  if (!is_file()) return false;
+Path::destroyFile() {
+  if (!isFile()) return false;
 
   DWORD attr = GetFileAttributes(path.c_str());
 


Index: llvm/lib/System/Win32/Program.cpp
diff -u llvm/lib/System/Win32/Program.cpp:1.2 llvm/lib/System/Win32/Program.cpp:1.3
--- llvm/lib/System/Win32/Program.cpp:1.2	Wed Sep 15 00:49:50 2004
+++ llvm/lib/System/Win32/Program.cpp	Fri Nov  5 16:15:36 2004
@@ -32,7 +32,7 @@
   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;


Index: llvm/lib/System/Win32/Signals.cpp
diff -u llvm/lib/System/Win32/Signals.cpp:1.9 llvm/lib/System/Win32/Signals.cpp:1.10
--- llvm/lib/System/Win32/Signals.cpp:1.9	Wed Oct 13 22:09:02 2004
+++ llvm/lib/System/Win32/Signals.cpp	Fri Nov  5 16:15:36 2004
@@ -93,7 +93,7 @@
   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 @@
   if (FilesToRemove != NULL)
     while (!FilesToRemove->empty()) {
       try {
-        FilesToRemove->back().destroy_file();
+        FilesToRemove->back().destroyFile();
       } catch (...) {
       }
       FilesToRemove->pop_back();
@@ -133,7 +133,7 @@
   if (DirectoriesToRemove != NULL)
     while (!DirectoriesToRemove->empty()) {
       try {
-        DirectoriesToRemove->back().destroy_directory(true);
+        DirectoriesToRemove->back().destroyDirectory(true);
       } catch (...) {
       }
       DirectoriesToRemove->pop_back();






More information about the llvm-commits mailing list