From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/source/Core/ValueObjectList.cpp | 184 +++++++++++++---------------------- 1 file changed, 70 insertions(+), 114 deletions(-) (limited to 'lldb/source/Core/ValueObjectList.cpp') diff --git a/lldb/source/Core/ValueObjectList.cpp b/lldb/source/Core/ValueObjectList.cpp index 180d4a0eaf1..7eae4974441 100644 --- a/lldb/source/Core/ValueObjectList.cpp +++ b/lldb/source/Core/ValueObjectList.cpp @@ -22,145 +22,101 @@ using namespace lldb; using namespace lldb_private; -ValueObjectList::ValueObjectList () : - m_value_objects() -{ -} +ValueObjectList::ValueObjectList() : m_value_objects() {} -ValueObjectList::ValueObjectList (const ValueObjectList &rhs) : - m_value_objects(rhs.m_value_objects) -{ -} +ValueObjectList::ValueObjectList(const ValueObjectList &rhs) + : m_value_objects(rhs.m_value_objects) {} +ValueObjectList::~ValueObjectList() {} -ValueObjectList::~ValueObjectList () -{ +const ValueObjectList &ValueObjectList::operator=(const ValueObjectList &rhs) { + if (this != &rhs) + m_value_objects = rhs.m_value_objects; + return *this; } -const ValueObjectList & -ValueObjectList::operator = (const ValueObjectList &rhs) -{ - if (this != &rhs) - m_value_objects = rhs.m_value_objects; - return *this; +void ValueObjectList::Append(const ValueObjectSP &val_obj_sp) { + m_value_objects.push_back(val_obj_sp); } -void -ValueObjectList::Append (const ValueObjectSP &val_obj_sp) -{ - m_value_objects.push_back(val_obj_sp); +void ValueObjectList::Append(const ValueObjectList &valobj_list) { + std::copy(valobj_list.m_value_objects.begin(), // source begin + valobj_list.m_value_objects.end(), // source end + back_inserter(m_value_objects)); // destination } -void -ValueObjectList::Append (const ValueObjectList &valobj_list) -{ - std::copy(valobj_list.m_value_objects.begin(), // source begin - valobj_list.m_value_objects.end(), // source end - back_inserter(m_value_objects)); // destination - -} +size_t ValueObjectList::GetSize() const { return m_value_objects.size(); } +void ValueObjectList::Resize(size_t size) { m_value_objects.resize(size); } -size_t -ValueObjectList::GetSize() const -{ - return m_value_objects.size(); +lldb::ValueObjectSP ValueObjectList::GetValueObjectAtIndex(size_t idx) { + lldb::ValueObjectSP valobj_sp; + if (idx < m_value_objects.size()) + valobj_sp = m_value_objects[idx]; + return valobj_sp; } -void -ValueObjectList::Resize (size_t size) -{ - m_value_objects.resize (size); +lldb::ValueObjectSP ValueObjectList::RemoveValueObjectAtIndex(size_t idx) { + lldb::ValueObjectSP valobj_sp; + if (idx < m_value_objects.size()) { + valobj_sp = m_value_objects[idx]; + m_value_objects.erase(m_value_objects.begin() + idx); + } + return valobj_sp; } -lldb::ValueObjectSP -ValueObjectList::GetValueObjectAtIndex (size_t idx) -{ - lldb::ValueObjectSP valobj_sp; - if (idx < m_value_objects.size()) - valobj_sp = m_value_objects[idx]; - return valobj_sp; +void ValueObjectList::SetValueObjectAtIndex(size_t idx, + const ValueObjectSP &valobj_sp) { + if (idx >= m_value_objects.size()) + m_value_objects.resize(idx + 1); + m_value_objects[idx] = valobj_sp; } -lldb::ValueObjectSP -ValueObjectList::RemoveValueObjectAtIndex (size_t idx) -{ - lldb::ValueObjectSP valobj_sp; - if (idx < m_value_objects.size()) - { - valobj_sp = m_value_objects[idx]; - m_value_objects.erase (m_value_objects.begin() + idx); +ValueObjectSP ValueObjectList::FindValueObjectByValueName(const char *name) { + ConstString name_const_str(name); + ValueObjectSP val_obj_sp; + collection::iterator pos, end = m_value_objects.end(); + for (pos = m_value_objects.begin(); pos != end; ++pos) { + ValueObject *valobj = (*pos).get(); + if (valobj && valobj->GetName() == name_const_str) { + val_obj_sp = *pos; + break; } - return valobj_sp; + } + return val_obj_sp; } -void -ValueObjectList::SetValueObjectAtIndex (size_t idx, const ValueObjectSP &valobj_sp) -{ - if (idx >= m_value_objects.size()) - m_value_objects.resize (idx + 1); - m_value_objects[idx] = valobj_sp; -} - -ValueObjectSP -ValueObjectList::FindValueObjectByValueName (const char *name) -{ - ConstString name_const_str(name); - ValueObjectSP val_obj_sp; - collection::iterator pos, end = m_value_objects.end(); - for (pos = m_value_objects.begin(); pos != end; ++pos) - { - ValueObject *valobj = (*pos).get(); - if (valobj && valobj->GetName() == name_const_str) - { - val_obj_sp = *pos; - break; - } +ValueObjectSP ValueObjectList::FindValueObjectByUID(lldb::user_id_t uid) { + ValueObjectSP valobj_sp; + collection::iterator pos, end = m_value_objects.end(); + + for (pos = m_value_objects.begin(); pos != end; ++pos) { + // Watch out for NULL objects in our list as the list + // might get resized to a specific size and lazily filled in + ValueObject *valobj = (*pos).get(); + if (valobj && valobj->GetID() == uid) { + valobj_sp = *pos; + break; } - return val_obj_sp; + } + return valobj_sp; } ValueObjectSP -ValueObjectList::FindValueObjectByUID (lldb::user_id_t uid) -{ - ValueObjectSP valobj_sp; - collection::iterator pos, end = m_value_objects.end(); - - for (pos = m_value_objects.begin(); pos != end; ++pos) - { - // Watch out for NULL objects in our list as the list - // might get resized to a specific size and lazily filled in - ValueObject *valobj = (*pos).get(); - if (valobj && valobj->GetID() == uid) - { - valobj_sp = *pos; - break; - } - } - return valobj_sp; -} - - -ValueObjectSP -ValueObjectList::FindValueObjectByPointer (ValueObject *find_valobj) -{ - ValueObjectSP valobj_sp; - collection::iterator pos, end = m_value_objects.end(); - - for (pos = m_value_objects.begin(); pos != end; ++pos) - { - ValueObject *valobj = (*pos).get(); - if (valobj && valobj == find_valobj) - { - valobj_sp = *pos; - break; - } +ValueObjectList::FindValueObjectByPointer(ValueObject *find_valobj) { + ValueObjectSP valobj_sp; + collection::iterator pos, end = m_value_objects.end(); + + for (pos = m_value_objects.begin(); pos != end; ++pos) { + ValueObject *valobj = (*pos).get(); + if (valobj && valobj == find_valobj) { + valobj_sp = *pos; + break; } - return valobj_sp; + } + return valobj_sp; } -void -ValueObjectList::Swap (ValueObjectList &value_object_list) -{ - m_value_objects.swap (value_object_list.m_value_objects); +void ValueObjectList::Swap(ValueObjectList &value_object_list) { + m_value_objects.swap(value_object_list.m_value_objects); } -- cgit v1.2.3