caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions 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

50
lldb/source/API/SBDeclaration.cpp
View File

@@ -18,15 +18,15 @@
using namespace lldb;
using namespace lldb_private;
SBDeclaration::SBDeclaration() : m_opaque_ap() {}
SBDeclaration::SBDeclaration() : m_opaque_up() {}
SBDeclaration::SBDeclaration(const SBDeclaration &rhs) : m_opaque_ap() {
SBDeclaration::SBDeclaration(const SBDeclaration &rhs) : m_opaque_up() {
if (rhs.IsValid())
ref() = rhs.ref();
}
SBDeclaration::SBDeclaration(const lldb_private::Declaration *lldb_object_ptr)
: m_opaque_ap() {
: m_opaque_up() {
if (lldb_object_ptr)
ref() = *lldb_object_ptr;
}
@@ -36,7 +36,7 @@ const SBDeclaration &SBDeclaration::operator=(const SBDeclaration &rhs) {
if (rhs.IsValid())
ref() = rhs.ref();
else
m_opaque_ap.reset();
m_opaque_up.reset();
}
return *this;
}
@@ -49,21 +49,21 @@ void SBDeclaration::SetDeclaration(
SBDeclaration::~SBDeclaration() {}
bool SBDeclaration::IsValid() const {
return m_opaque_ap.get() && m_opaque_ap->IsValid();
return m_opaque_up.get() && m_opaque_up->IsValid();
}
SBFileSpec SBDeclaration::GetFileSpec() const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
SBFileSpec sb_file_spec;
if (m_opaque_ap.get() && m_opaque_ap->GetFile())
sb_file_spec.SetFileSpec(m_opaque_ap->GetFile());
if (m_opaque_up.get() && m_opaque_up->GetFile())
sb_file_spec.SetFileSpec(m_opaque_up->GetFile());
if (log) {
SBStream sstr;
sb_file_spec.GetDescription(sstr);
log->Printf("SBLineEntry(%p)::GetFileSpec () => SBFileSpec(%p): %s",
static_cast<void *>(m_opaque_ap.get()),
static_cast<void *>(m_opaque_up.get()),
static_cast<const void *>(sb_file_spec.get()), sstr.GetData());
}
@@ -74,19 +74,19 @@ uint32_t SBDeclaration::GetLine() const {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
uint32_t line = 0;
if (m_opaque_ap)
line = m_opaque_ap->GetLine();
if (m_opaque_up)
line = m_opaque_up->GetLine();
if (log)
log->Printf("SBLineEntry(%p)::GetLine () => %u",
static_cast<void *>(m_opaque_ap.get()), line);
static_cast<void *>(m_opaque_up.get()), line);
return line;
}
uint32_t SBDeclaration::GetColumn() const {
if (m_opaque_ap)
return m_opaque_ap->GetColumn();
if (m_opaque_up)
return m_opaque_up->GetColumn();
return 0;
}
@@ -101,8 +101,8 @@ void SBDeclaration::SetLine(uint32_t line) { ref().SetLine(line); }
void SBDeclaration::SetColumn(uint32_t column) { ref().SetColumn(column); }
bool SBDeclaration::operator==(const SBDeclaration &rhs) const {
lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
lldb_private::Declaration *lhs_ptr = m_opaque_up.get();
lldb_private::Declaration *rhs_ptr = rhs.m_opaque_up.get();
if (lhs_ptr && rhs_ptr)
return lldb_private::Declaration::Compare(*lhs_ptr, *rhs_ptr) == 0;
@@ -111,8 +111,8 @@ bool SBDeclaration::operator==(const SBDeclaration &rhs) const {
}
bool SBDeclaration::operator!=(const SBDeclaration &rhs) const {
lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
lldb_private::Declaration *lhs_ptr = m_opaque_up.get();
lldb_private::Declaration *rhs_ptr = rhs.m_opaque_up.get();
if (lhs_ptr && rhs_ptr)
return lldb_private::Declaration::Compare(*lhs_ptr, *rhs_ptr) != 0;
@@ -121,25 +121,25 @@ bool SBDeclaration::operator!=(const SBDeclaration &rhs) const {
}
const lldb_private::Declaration *SBDeclaration::operator->() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
lldb_private::Declaration &SBDeclaration::ref() {
if (m_opaque_ap == NULL)
m_opaque_ap.reset(new lldb_private::Declaration());
return *m_opaque_ap;
if (m_opaque_up == NULL)
m_opaque_up.reset(new lldb_private::Declaration());
return *m_opaque_up;
}
const lldb_private::Declaration &SBDeclaration::ref() const {
return *m_opaque_ap;
return *m_opaque_up;
}
bool SBDeclaration::GetDescription(SBStream &description) {
Stream &strm = description.ref();
if (m_opaque_ap) {
if (m_opaque_up) {
char file_path[PATH_MAX * 2];
m_opaque_ap->GetFile().GetPath(file_path, sizeof(file_path));
m_opaque_up->GetFile().GetPath(file_path, sizeof(file_path));
strm.Printf("%s:%u", file_path, GetLine());
if (GetColumn() > 0)
strm.Printf(":%u", GetColumn());
@@ -149,4 +149,4 @@ bool SBDeclaration::GetDescription(SBStream &description) {
return true;
}
lldb_private::Declaration *SBDeclaration::get() { return m_opaque_ap.get(); }
lldb_private::Declaration *SBDeclaration::get() { return m_opaque_up.get(); }