*** 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:

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

1 files changed, 123 insertions, 188 deletions

diff --git a/lldb/source/API/SBLineEntry.cpp b/lldb/source/API/SBLineEntry.cpp
index 833eea3..3469cec 100644
--- a/lldb/source/API/SBLineEntry.cpp
+++ b/lldb/source/API/SBLineEntry.cpp
@@ -11,244 +11,179 @@
 
 #include "lldb/API/SBLineEntry.h"
 #include "lldb/API/SBStream.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/Log.h"
+#include "lldb/Core/StreamString.h"
 #include "lldb/Symbol/LineEntry.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+SBLineEntry::SBLineEntry() : m_opaque_ap() {}
 
-SBLineEntry::SBLineEntry () :
-    m_opaque_ap ()
-{
+SBLineEntry::SBLineEntry(const SBLineEntry &rhs) : m_opaque_ap() {
+  if (rhs.IsValid())
+    ref() = rhs.ref();
 }
 
-SBLineEntry::SBLineEntry (const SBLineEntry &rhs) :
-    m_opaque_ap ()
-{
-    if (rhs.IsValid())
-        ref() = rhs.ref();
-}
-
-SBLineEntry::SBLineEntry (const lldb_private::LineEntry *lldb_object_ptr) :
-    m_opaque_ap ()
-{
-    if (lldb_object_ptr)
-        ref() = *lldb_object_ptr;
-}
-
-const SBLineEntry &
-SBLineEntry::operator = (const SBLineEntry &rhs)
-{
-    if (this != &rhs)
-    {
-        if (rhs.IsValid())
-            ref() = rhs.ref();
-        else
-            m_opaque_ap.reset();
-    }
-    return *this;
-}
-
-void
-SBLineEntry::SetLineEntry (const lldb_private::LineEntry &lldb_object_ref)
-{
-    ref() = lldb_object_ref;
+SBLineEntry::SBLineEntry(const lldb_private::LineEntry *lldb_object_ptr)
+    : m_opaque_ap() {
+  if (lldb_object_ptr)
+    ref() = *lldb_object_ptr;
 }
 
+const SBLineEntry &SBLineEntry::operator=(const SBLineEntry &rhs) {
+  if (this != &rhs) {
+    if (rhs.IsValid())
+      ref() = rhs.ref();
+    else
+      m_opaque_ap.reset();
+  }
+  return *this;
+}
 
-SBLineEntry::~SBLineEntry ()
-{
+void SBLineEntry::SetLineEntry(const lldb_private::LineEntry &lldb_object_ref) {
+  ref() = lldb_object_ref;
 }
 
+SBLineEntry::~SBLineEntry() {}
 
-SBAddress
-SBLineEntry::GetStartAddress () const
-{
-    SBAddress sb_address;
-    if (m_opaque_ap.get())
-        sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress());
+SBAddress SBLineEntry::GetStartAddress() const {
+  SBAddress sb_address;
+  if (m_opaque_ap.get())
+    sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress());
 
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-    {
-        StreamString sstr;
-        const Address *addr = sb_address.get();
-        if (addr)
-            addr->Dump (&sstr, NULL, Address::DumpStyleModuleWithFileAddress, Address::DumpStyleInvalid, 4);
-        log->Printf ("SBLineEntry(%p)::GetStartAddress () => SBAddress (%p): %s",
-                     static_cast<void*>(m_opaque_ap.get()),
-                     static_cast<void*>(sb_address.get()), sstr.GetData());
-    }
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log) {
+    StreamString sstr;
+    const Address *addr = sb_address.get();
+    if (addr)
+      addr->Dump(&sstr, NULL, Address::DumpStyleModuleWithFileAddress,
+                 Address::DumpStyleInvalid, 4);
+    log->Printf("SBLineEntry(%p)::GetStartAddress () => SBAddress (%p): %s",
+                static_cast<void *>(m_opaque_ap.get()),
+                static_cast<void *>(sb_address.get()), sstr.GetData());
+  }
 
-    return sb_address;
+  return sb_address;
 }
 
-SBAddress
-SBLineEntry::GetEndAddress () const
-{
-    SBAddress sb_address;
-    if (m_opaque_ap.get())
-    {
-        sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress());
-        sb_address.OffsetAddress(m_opaque_ap->range.GetByteSize());
-    }
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-    if (log)
-    {
-        StreamString sstr;
-        const Address *addr = sb_address.get();
-        if (addr)
-            addr->Dump (&sstr, NULL, Address::DumpStyleModuleWithFileAddress, Address::DumpStyleInvalid, 4);
-        log->Printf ("SBLineEntry(%p)::GetEndAddress () => SBAddress (%p): %s",
-                     static_cast<void*>(m_opaque_ap.get()),
-                     static_cast<void*>(sb_address.get()), sstr.GetData());
-    }
-    return sb_address;
+SBAddress SBLineEntry::GetEndAddress() const {
+  SBAddress sb_address;
+  if (m_opaque_ap.get()) {
+    sb_address.SetAddress(&m_opaque_ap->range.GetBaseAddress());
+    sb_address.OffsetAddress(m_opaque_ap->range.GetByteSize());
+  }
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+  if (log) {
+    StreamString sstr;
+    const Address *addr = sb_address.get();
+    if (addr)
+      addr->Dump(&sstr, NULL, Address::DumpStyleModuleWithFileAddress,
+                 Address::DumpStyleInvalid, 4);
+    log->Printf("SBLineEntry(%p)::GetEndAddress () => SBAddress (%p): %s",
+                static_cast<void *>(m_opaque_ap.get()),
+                static_cast<void *>(sb_address.get()), sstr.GetData());
+  }
+  return sb_address;
 }
 
-bool
-SBLineEntry::IsValid () const
-{
-    return m_opaque_ap.get() && m_opaque_ap->IsValid();
+bool SBLineEntry::IsValid() const {
+  return m_opaque_ap.get() && m_opaque_ap->IsValid();
 }
 
+SBFileSpec SBLineEntry::GetFileSpec() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-SBFileSpec
-SBLineEntry::GetFileSpec () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    SBFileSpec sb_file_spec;
-    if (m_opaque_ap.get() && m_opaque_ap->file)
-        sb_file_spec.SetFileSpec(m_opaque_ap->file);
+  SBFileSpec sb_file_spec;
+  if (m_opaque_ap.get() && m_opaque_ap->file)
+    sb_file_spec.SetFileSpec(m_opaque_ap->file);
 
-    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<const void*>(sb_file_spec.get()),
-                     sstr.GetData());
-    }
-
-    return sb_file_spec;
-}
+  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<const void *>(sb_file_spec.get()), sstr.GetData());
+  }
 
-uint32_t
-SBLineEntry::GetLine () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    uint32_t line = 0;
-    if (m_opaque_ap.get())
-        line = m_opaque_ap->line;
+  return sb_file_spec;
+}
 
-    if (log)
-        log->Printf ("SBLineEntry(%p)::GetLine () => %u",
-                     static_cast<void*>(m_opaque_ap.get()), line);
+uint32_t SBLineEntry::GetLine() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-    return line;
-}
+  uint32_t line = 0;
+  if (m_opaque_ap.get())
+    line = m_opaque_ap->line;
 
+  if (log)
+    log->Printf("SBLineEntry(%p)::GetLine () => %u",
+                static_cast<void *>(m_opaque_ap.get()), line);
 
-uint32_t
-SBLineEntry::GetColumn () const
-{
-    if (m_opaque_ap.get())
-        return m_opaque_ap->column;
-    return 0;
-}
-
-void
-SBLineEntry::SetFileSpec (lldb::SBFileSpec filespec)
-{
-    if (filespec.IsValid())
-        ref().file = filespec.ref();
-    else
-        ref().file.Clear();
-}
-void
-SBLineEntry::SetLine (uint32_t line)
-{
-    ref().line = line;
+  return line;
 }
 
-void
-SBLineEntry::SetColumn (uint32_t column)
-{
-    ref().line = column;
+uint32_t SBLineEntry::GetColumn() const {
+  if (m_opaque_ap.get())
+    return m_opaque_ap->column;
+  return 0;
 }
 
+void SBLineEntry::SetFileSpec(lldb::SBFileSpec filespec) {
+  if (filespec.IsValid())
+    ref().file = filespec.ref();
+  else
+    ref().file.Clear();
+}
+void SBLineEntry::SetLine(uint32_t line) { ref().line = line; }
 
+void SBLineEntry::SetColumn(uint32_t column) { ref().line = column; }
 
-bool
-SBLineEntry::operator == (const SBLineEntry &rhs) const
-{
-    lldb_private::LineEntry *lhs_ptr = m_opaque_ap.get();
-    lldb_private::LineEntry *rhs_ptr = rhs.m_opaque_ap.get();
+bool SBLineEntry::operator==(const SBLineEntry &rhs) const {
+  lldb_private::LineEntry *lhs_ptr = m_opaque_ap.get();
+  lldb_private::LineEntry *rhs_ptr = rhs.m_opaque_ap.get();
 
-    if (lhs_ptr && rhs_ptr)
-        return lldb_private::LineEntry::Compare (*lhs_ptr, *rhs_ptr) == 0;
+  if (lhs_ptr && rhs_ptr)
+    return lldb_private::LineEntry::Compare(*lhs_ptr, *rhs_ptr) == 0;
 
-    return lhs_ptr == rhs_ptr;
+  return lhs_ptr == rhs_ptr;
 }
 
-bool
-SBLineEntry::operator != (const SBLineEntry &rhs) const
-{
-    lldb_private::LineEntry *lhs_ptr = m_opaque_ap.get();
-    lldb_private::LineEntry *rhs_ptr = rhs.m_opaque_ap.get();
+bool SBLineEntry::operator!=(const SBLineEntry &rhs) const {
+  lldb_private::LineEntry *lhs_ptr = m_opaque_ap.get();
+  lldb_private::LineEntry *rhs_ptr = rhs.m_opaque_ap.get();
 
-    if (lhs_ptr && rhs_ptr)
-        return lldb_private::LineEntry::Compare (*lhs_ptr, *rhs_ptr) != 0;
+  if (lhs_ptr && rhs_ptr)
+    return lldb_private::LineEntry::Compare(*lhs_ptr, *rhs_ptr) != 0;
 
-    return lhs_ptr != rhs_ptr;
+  return lhs_ptr != rhs_ptr;
 }
 
-const lldb_private::LineEntry *
-SBLineEntry::operator->() const
-{
-    return m_opaque_ap.get();
+const lldb_private::LineEntry *SBLineEntry::operator->() const {
+  return m_opaque_ap.get();
 }
 
-lldb_private::LineEntry &
-SBLineEntry::ref()
-{
-    if (m_opaque_ap.get() == NULL)
-        m_opaque_ap.reset (new lldb_private::LineEntry ());
-    return *m_opaque_ap;
+lldb_private::LineEntry &SBLineEntry::ref() {
+  if (m_opaque_ap.get() == NULL)
+    m_opaque_ap.reset(new lldb_private::LineEntry());
+  return *m_opaque_ap;
 }
 
-const lldb_private::LineEntry &
-SBLineEntry::ref() const
-{
-    return *m_opaque_ap;
-}
+const lldb_private::LineEntry &SBLineEntry::ref() const { return *m_opaque_ap; }
 
-bool
-SBLineEntry::GetDescription (SBStream &description)
-{
-    Stream &strm = description.ref();
+bool SBLineEntry::GetDescription(SBStream &description) {
+  Stream &strm = description.ref();
 
-    if (m_opaque_ap.get())
-    {
-        char file_path[PATH_MAX*2];
-        m_opaque_ap->file.GetPath (file_path, sizeof (file_path));
-        strm.Printf ("%s:%u", file_path, GetLine());
-        if (GetColumn() > 0)
-            strm.Printf (":%u", GetColumn());
-    }
-    else
-        strm.PutCString ("No value");
+  if (m_opaque_ap.get()) {
+    char file_path[PATH_MAX * 2];
+    m_opaque_ap->file.GetPath(file_path, sizeof(file_path));
+    strm.Printf("%s:%u", file_path, GetLine());
+    if (GetColumn() > 0)
+      strm.Printf(":%u", GetColumn());
+  } else
+    strm.PutCString("No value");
 
-    return true;
+  return true;
 }
 
-lldb_private::LineEntry *
-SBLineEntry::get ()
-{
-    return m_opaque_ap.get();
-}
+lldb_private::LineEntry *SBLineEntry::get() { return m_opaque_ap.get(); }