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

40
lldb/source/API/SBFileSpecList.cpp
View File

@@ -20,19 +20,19 @@
using namespace lldb;
using namespace lldb_private;
SBFileSpecList::SBFileSpecList() : m_opaque_ap(new FileSpecList()) {}
SBFileSpecList::SBFileSpecList() : m_opaque_up(new FileSpecList()) {}
SBFileSpecList::SBFileSpecList(const SBFileSpecList &rhs) : m_opaque_ap() {
SBFileSpecList::SBFileSpecList(const SBFileSpecList &rhs) : m_opaque_up() {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
if (rhs.m_opaque_ap)
m_opaque_ap.reset(new FileSpecList(*(rhs.get())));
if (rhs.m_opaque_up)
m_opaque_up.reset(new FileSpecList(*(rhs.get())));
if (log) {
log->Printf("SBFileSpecList::SBFileSpecList (const SBFileSpecList "
"rhs.ap=%p) => SBFileSpecList(%p)",
static_cast<void *>(rhs.m_opaque_ap.get()),
static_cast<void *>(m_opaque_ap.get()));
static_cast<void *>(rhs.m_opaque_up.get()),
static_cast<void *>(m_opaque_up.get()));
}
}
@@ -40,59 +40,59 @@ SBFileSpecList::~SBFileSpecList() {}
const SBFileSpecList &SBFileSpecList::operator=(const SBFileSpecList &rhs) {
if (this != &rhs) {
m_opaque_ap.reset(new lldb_private::FileSpecList(*(rhs.get())));
m_opaque_up.reset(new lldb_private::FileSpecList(*(rhs.get())));
}
return *this;
}
uint32_t SBFileSpecList::GetSize() const { return m_opaque_ap->GetSize(); }
uint32_t SBFileSpecList::GetSize() const { return m_opaque_up->GetSize(); }
void SBFileSpecList::Append(const SBFileSpec &sb_file) {
m_opaque_ap->Append(sb_file.ref());
m_opaque_up->Append(sb_file.ref());
}
bool SBFileSpecList::AppendIfUnique(const SBFileSpec &sb_file) {
return m_opaque_ap->AppendIfUnique(sb_file.ref());
return m_opaque_up->AppendIfUnique(sb_file.ref());
}
void SBFileSpecList::Clear() { m_opaque_ap->Clear(); }
void SBFileSpecList::Clear() { m_opaque_up->Clear(); }
uint32_t SBFileSpecList::FindFileIndex(uint32_t idx, const SBFileSpec &sb_file,
bool full) {
return m_opaque_ap->FindFileIndex(idx, sb_file.ref(), full);
return m_opaque_up->FindFileIndex(idx, sb_file.ref(), full);
}
const SBFileSpec SBFileSpecList::GetFileSpecAtIndex(uint32_t idx) const {
SBFileSpec new_spec;
new_spec.SetFileSpec(m_opaque_ap->GetFileSpecAtIndex(idx));
new_spec.SetFileSpec(m_opaque_up->GetFileSpecAtIndex(idx));
return new_spec;
}
const lldb_private::FileSpecList *SBFileSpecList::operator->() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
const lldb_private::FileSpecList *SBFileSpecList::get() const {
return m_opaque_ap.get();
return m_opaque_up.get();
}
const lldb_private::FileSpecList &SBFileSpecList::operator*() const {
return *m_opaque_ap;
return *m_opaque_up;
}
const lldb_private::FileSpecList &SBFileSpecList::ref() const {
return *m_opaque_ap;
return *m_opaque_up;
}
bool SBFileSpecList::GetDescription(SBStream &description) const {
Stream &strm = description.ref();
if (m_opaque_ap) {
uint32_t num_files = m_opaque_ap->GetSize();
if (m_opaque_up) {
uint32_t num_files = m_opaque_up->GetSize();
strm.Printf("%d files: ", num_files);
for (uint32_t i = 0; i < num_files; i++) {
char path[PATH_MAX];
if (m_opaque_ap->GetFileSpecAtIndex(i).GetPath(path, sizeof(path)))
if (m_opaque_up->GetFileSpecAtIndex(i).GetPath(path, sizeof(path)))
strm.Printf("\n %s", path);
}
} else