intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-16 21:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'ap' with 'up' suffix in variable names. (NFC)

Browse Source 
The `ap` suffix is a remnant of lldb's former use of auto pointers,
before they got deprecated. Although all their uses were replaced by
unique pointers, some variables still carried the suffix.

In r353795 I removed another auto_ptr remnant, namely redundant calls to
::get for unique_pointers. Jim justly noted that this is a good
opportunity to clean up the variable names as well.

I went over all the changes to ensure my find-and-replace didn't have
any undesired side-effects. I hope I didn't miss any, but if you end up
at this commit doing a git blame on a weirdly named variable, please
know that the change was unintentional.

llvm-svn: 353912
This commit is contained in:
Jonas Devlieghere
2019-02-13 06:25:41 +00:00
parent 5cf777e413
commit d5b440369d
190 changed files with 1963 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lldb/source/API/SBFileSpec.cpp
View File

@@ -22,50 +22,50 @@
using namespace lldb;
using namespace lldb_private;
SBFileSpec::SBFileSpec() : m_opaque_ap(new lldb_private::FileSpec()) {}
SBFileSpec::SBFileSpec() : m_opaque_up(new lldb_private::FileSpec()) {}
SBFileSpec::SBFileSpec(const SBFileSpec &rhs)
: m_opaque_ap(new lldb_private::FileSpec(*rhs.m_opaque_ap)) {}
: m_opaque_up(new lldb_private::FileSpec(*rhs.m_opaque_up)) {}
SBFileSpec::SBFileSpec(const lldb_private::FileSpec &fspec)
: m_opaque_ap(new lldb_private::FileSpec(fspec)) {}
: m_opaque_up(new lldb_private::FileSpec(fspec)) {}
// Deprecated!!!
SBFileSpec::SBFileSpec(const char *path) : m_opaque_ap(new FileSpec(path)) {
FileSystem::Instance().Resolve(*m_opaque_ap);
SBFileSpec::SBFileSpec(const char *path) : m_opaque_up(new FileSpec(path)) {
FileSystem::Instance().Resolve(*m_opaque_up);
}
SBFileSpec::SBFileSpec(const char *path, bool resolve)
: m_opaque_ap(new FileSpec(path)) {
: m_opaque_up(new FileSpec(path)) {
if (resolve)
FileSystem::Instance().Resolve(*m_opaque_ap);
FileSystem::Instance().Resolve(*m_opaque_up);
}
SBFileSpec::~SBFileSpec() {}
const SBFileSpec &SBFileSpec::operator=(const SBFileSpec &rhs) {
if (this != &rhs)
*m_opaque_ap = *rhs.m_opaque_ap;
*m_opaque_up = *rhs.m_opaque_up;
return *this;
}
bool SBFileSpec::IsValid() const { return m_opaque_ap->operator bool(); }
bool SBFileSpec::IsValid() const { return m_opaque_up->operator bool(); }
bool SBFileSpec::Exists() const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
bool result = FileSystem::Instance().Exists(*m_opaque_ap);
bool result = FileSystem::Instance().Exists(*m_opaque_up);
if (log)
log->Printf("SBFileSpec(%p)::Exists () => %s",
static_cast<void *>(m_opaque_ap.get()),
static_cast<void *>(m_opaque_up.get()),
(result ? "true" : "false"));
return result;
}
bool SBFileSpec::ResolveExecutableLocation() {
return FileSystem::Instance().ResolveExecutableLocation(*m_opaque_ap);
return FileSystem::Instance().ResolveExecutableLocation(*m_opaque_up);
}
int SBFileSpec::ResolvePath(const char *src_path, char *dst_path,
@@ -77,60 +77,60 @@ int SBFileSpec::ResolvePath(const char *src_path, char *dst_path,
}
const char *SBFileSpec::GetFilename() const {
const char *s = m_opaque_ap->GetFilename().AsCString();
const char *s = m_opaque_up->GetFilename().AsCString();
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (log) {
if (s)
log->Printf("SBFileSpec(%p)::GetFilename () => \"%s\"",
static_cast<void *>(m_opaque_ap.get()), s);
static_cast<void *>(m_opaque_up.get()), s);
else
log->Printf("SBFileSpec(%p)::GetFilename () => NULL",
static_cast<void *>(m_opaque_ap.get()));
static_cast<void *>(m_opaque_up.get()));
}
return s;
}
const char *SBFileSpec::GetDirectory() const {
FileSpec directory{*m_opaque_ap};
FileSpec directory{*m_opaque_up};
directory.GetFilename().Clear();
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (log) {
if (directory)
log->Printf("SBFileSpec(%p)::GetDirectory () => \"%s\"",
static_cast<void *>(m_opaque_ap.get()),
static_cast<void *>(m_opaque_up.get()),
directory.GetCString());
else
log->Printf("SBFileSpec(%p)::GetDirectory () => NULL",
static_cast<void *>(m_opaque_ap.get()));
static_cast<void *>(m_opaque_up.get()));
}
return directory.GetCString();
}
void SBFileSpec::SetFilename(const char *filename) {
if (filename && filename[0])
m_opaque_ap->GetFilename().SetCString(filename);
m_opaque_up->GetFilename().SetCString(filename);
else
m_opaque_ap->GetFilename().Clear();
m_opaque_up->GetFilename().Clear();
}
void SBFileSpec::SetDirectory(const char *directory) {
if (directory && directory[0])
m_opaque_ap->GetDirectory().SetCString(directory);
m_opaque_up->GetDirectory().SetCString(directory);
else
m_opaque_ap->GetDirectory().Clear();
m_opaque_up->GetDirectory().Clear();
}
uint32_t SBFileSpec::GetPath(char *dst_path, size_t dst_len) const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
uint32_t result = m_opaque_ap->GetPath(dst_path, dst_len);
uint32_t result = m_opaque_up->GetPath(dst_path, dst_len);
if (log)
log->Printf("SBFileSpec(%p)::GetPath (dst_path=\"%.*s\", dst_len=%" PRIu64
") => %u",
static_cast<void *>(m_opaque_ap.get()), result, dst_path,
static_cast<void *>(m_opaque_up.get()), result, dst_path,
static_cast<uint64_t>(dst_len), result);
if (result == 0 && dst_path && dst_len > 0)
@@ -139,31 +139,31 @@ uint32_t SBFileSpec::GetPath(char *dst_path, size_t dst_len) const {
}
const lldb_private::FileSpec *SBFileSpec::operator->() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
const lldb_private::FileSpec *SBFileSpec::get() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
const lldb_private::FileSpec &SBFileSpec::operator*() const {
return *m_opaque_ap;
return *m_opaque_up;
}
const lldb_private::FileSpec &SBFileSpec::ref() const { return *m_opaque_ap; }
const lldb_private::FileSpec &SBFileSpec::ref() const { return *m_opaque_up; }
void SBFileSpec::SetFileSpec(const lldb_private::FileSpec &fs) {
*m_opaque_ap = fs;
*m_opaque_up = fs;
}
bool SBFileSpec::GetDescription(SBStream &description) const {
Stream &strm = description.ref();
char path[PATH_MAX];
if (m_opaque_ap->GetPath(path, sizeof(path)))
if (m_opaque_up->GetPath(path, sizeof(path)))
strm.PutCString(path);
return true;
}
void SBFileSpec::AppendPathComponent(const char *fn) {
m_opaque_ap->AppendPathComponent(fn);
m_opaque_up->AppendPathComponent(fn);
}