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

44
lldb/source/API/SBStringList.cpp
View File

@@ -13,25 +13,25 @@
using namespace lldb;
using namespace lldb_private;
SBStringList::SBStringList() : m_opaque_ap() {}
SBStringList::SBStringList() : m_opaque_up() {}
SBStringList::SBStringList(const lldb_private::StringList *lldb_strings_ptr)
: m_opaque_ap() {
: m_opaque_up() {
if (lldb_strings_ptr)
m_opaque_ap.reset(new lldb_private::StringList(*lldb_strings_ptr));
m_opaque_up.reset(new lldb_private::StringList(*lldb_strings_ptr));
}
SBStringList::SBStringList(const SBStringList &rhs) : m_opaque_ap() {
SBStringList::SBStringList(const SBStringList &rhs) : m_opaque_up() {
if (rhs.IsValid())
m_opaque_ap.reset(new lldb_private::StringList(*rhs));
m_opaque_up.reset(new lldb_private::StringList(*rhs));
}
const SBStringList &SBStringList::operator=(const SBStringList &rhs) {
if (this != &rhs) {
if (rhs.IsValid())
m_opaque_ap.reset(new lldb_private::StringList(*rhs));
m_opaque_up.reset(new lldb_private::StringList(*rhs));
else
m_opaque_ap.reset();
m_opaque_up.reset();
}
return *this;
}
@@ -39,70 +39,70 @@ const SBStringList &SBStringList::operator=(const SBStringList &rhs) {
SBStringList::~SBStringList() {}
const lldb_private::StringList *SBStringList::operator->() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
const lldb_private::StringList &SBStringList::operator*() const {
return *m_opaque_ap;
return *m_opaque_up;
}
bool SBStringList::IsValid() const { return (m_opaque_ap != NULL); }
bool SBStringList::IsValid() const { return (m_opaque_up != NULL); }
void SBStringList::AppendString(const char *str) {
if (str != NULL) {
if (IsValid())
m_opaque_ap->AppendString(str);
m_opaque_up->AppendString(str);
else
m_opaque_ap.reset(new lldb_private::StringList(str));
m_opaque_up.reset(new lldb_private::StringList(str));
}
}
void SBStringList::AppendList(const char **strv, int strc) {
if ((strv != NULL) && (strc > 0)) {
if (IsValid())
m_opaque_ap->AppendList(strv, strc);
m_opaque_up->AppendList(strv, strc);
else
m_opaque_ap.reset(new lldb_private::StringList(strv, strc));
m_opaque_up.reset(new lldb_private::StringList(strv, strc));
}
}
void SBStringList::AppendList(const SBStringList &strings) {
if (strings.IsValid()) {
if (!IsValid())
m_opaque_ap.reset(new lldb_private::StringList());
m_opaque_ap->AppendList(*(strings.m_opaque_ap));
m_opaque_up.reset(new lldb_private::StringList());
m_opaque_up->AppendList(*(strings.m_opaque_up));
}
}
void SBStringList::AppendList(const StringList &strings) {
if (!IsValid())
m_opaque_ap.reset(new lldb_private::StringList());
m_opaque_ap->AppendList(strings);
m_opaque_up.reset(new lldb_private::StringList());
m_opaque_up->AppendList(strings);
}
uint32_t SBStringList::GetSize() const {
if (IsValid()) {
return m_opaque_ap->GetSize();
return m_opaque_up->GetSize();
}
return 0;
}
const char *SBStringList::GetStringAtIndex(size_t idx) {
if (IsValid()) {
return m_opaque_ap->GetStringAtIndex(idx);
return m_opaque_up->GetStringAtIndex(idx);
}
return NULL;
}
const char *SBStringList::GetStringAtIndex(size_t idx) const {
if (IsValid()) {
return m_opaque_ap->GetStringAtIndex(idx);
return m_opaque_up->GetStringAtIndex(idx);
}
return NULL;
}
void SBStringList::Clear() {
if (IsValid()) {
m_opaque_ap->Clear();
m_opaque_up->Clear();
}
}