From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= 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/API/SBFileSpecList.cpp | 148 ++++++++++++++----------------------- 1 file changed, 54 insertions(+), 94 deletions(-) (limited to 'lldb/source/API/SBFileSpecList.cpp') diff --git a/lldb/source/API/SBFileSpecList.cpp b/lldb/source/API/SBFileSpecList.cpp index a457a75..9e157ea 100644 --- a/lldb/source/API/SBFileSpecList.cpp +++ b/lldb/source/API/SBFileSpecList.cpp @@ -1,4 +1,5 @@ -//===-- SBFileSpecListList.cpp ------------------------------------------*- C++ -*-===// +//===-- SBFileSpecListList.cpp ------------------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -20,124 +21,83 @@ using namespace lldb; using namespace lldb_private; +SBFileSpecList::SBFileSpecList() : m_opaque_ap(new FileSpecList()) {} +SBFileSpecList::SBFileSpecList(const SBFileSpecList &rhs) : m_opaque_ap() { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API)); -SBFileSpecList::SBFileSpecList () : - m_opaque_ap(new FileSpecList()) -{ -} - -SBFileSpecList::SBFileSpecList (const SBFileSpecList &rhs) : - m_opaque_ap() -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API)); - - if (rhs.m_opaque_ap.get()) - m_opaque_ap.reset (new FileSpecList (*(rhs.get()))); + if (rhs.m_opaque_ap.get()) + m_opaque_ap.reset(new FileSpecList(*(rhs.get()))); - if (log) - { - log->Printf ("SBFileSpecList::SBFileSpecList (const SBFileSpecList rhs.ap=%p) => SBFileSpecList(%p)", - static_cast(rhs.m_opaque_ap.get()), - static_cast(m_opaque_ap.get())); - } + if (log) { + log->Printf("SBFileSpecList::SBFileSpecList (const SBFileSpecList " + "rhs.ap=%p) => SBFileSpecList(%p)", + static_cast(rhs.m_opaque_ap.get()), + static_cast(m_opaque_ap.get())); + } } -SBFileSpecList::~SBFileSpecList () -{ -} +SBFileSpecList::~SBFileSpecList() {} -const SBFileSpecList & -SBFileSpecList::operator = (const SBFileSpecList &rhs) -{ - if (this != &rhs) - { - m_opaque_ap.reset (new lldb_private::FileSpecList(*(rhs.get()))); - } - return *this; +const SBFileSpecList &SBFileSpecList::operator=(const SBFileSpecList &rhs) { + if (this != &rhs) { + m_opaque_ap.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_ap->GetSize(); } -void -SBFileSpecList::Append (const SBFileSpec &sb_file) -{ - m_opaque_ap->Append (sb_file.ref()); +void SBFileSpecList::Append(const SBFileSpec &sb_file) { + m_opaque_ap->Append(sb_file.ref()); } -bool -SBFileSpecList::AppendIfUnique (const SBFileSpec &sb_file) -{ - return m_opaque_ap->AppendIfUnique (sb_file.ref()); +bool SBFileSpecList::AppendIfUnique(const SBFileSpec &sb_file) { + return m_opaque_ap->AppendIfUnique(sb_file.ref()); } -void -SBFileSpecList::Clear() -{ - m_opaque_ap->Clear(); -} +void SBFileSpecList::Clear() { m_opaque_ap->Clear(); } -uint32_t -SBFileSpecList::FindFileIndex (uint32_t idx, const SBFileSpec &sb_file, bool full) -{ - return m_opaque_ap->FindFileIndex (idx, sb_file.ref(), full); +uint32_t SBFileSpecList::FindFileIndex(uint32_t idx, const SBFileSpec &sb_file, + bool full) { + return m_opaque_ap->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)); - return new_spec; +const SBFileSpec SBFileSpecList::GetFileSpecAtIndex(uint32_t idx) const { + SBFileSpec new_spec; + new_spec.SetFileSpec(m_opaque_ap->GetFileSpecAtIndex(idx)); + return new_spec; } -const lldb_private::FileSpecList * -SBFileSpecList::operator->() const -{ - return m_opaque_ap.get(); +const lldb_private::FileSpecList *SBFileSpecList::operator->() const { + return m_opaque_ap.get(); } -const lldb_private::FileSpecList * -SBFileSpecList::get() const -{ - return m_opaque_ap.get(); +const lldb_private::FileSpecList *SBFileSpecList::get() const { + return m_opaque_ap.get(); } - -const lldb_private::FileSpecList & -SBFileSpecList::operator*() const -{ - return *m_opaque_ap.get(); +const lldb_private::FileSpecList &SBFileSpecList::operator*() const { + return *m_opaque_ap.get(); } -const lldb_private::FileSpecList & -SBFileSpecList::ref() const -{ - return *m_opaque_ap.get(); +const lldb_private::FileSpecList &SBFileSpecList::ref() const { + return *m_opaque_ap.get(); } -bool -SBFileSpecList::GetDescription (SBStream &description) const -{ - Stream &strm = description.ref(); - - if (m_opaque_ap.get()) - { - uint32_t num_files = m_opaque_ap->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))) - strm.Printf ("\n %s", path); - } +bool SBFileSpecList::GetDescription(SBStream &description) const { + Stream &strm = description.ref(); + + if (m_opaque_ap.get()) { + uint32_t num_files = m_opaque_ap->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))) + strm.Printf("\n %s", path); } - else - strm.PutCString ("No value"); - - return true; + } else + strm.PutCString("No value"); + + return true; } -- cgit v1.1