1 files changed, 92 insertions, 148 deletions

diff --git a/lldb/source/API/SBDeclaration.cpp b/lldb/source/API/SBDeclaration.cpp
index 8aea675afeb..fc21f83f7ce 100644
--- a/lldb/source/API/SBDeclaration.cpp
+++ b/lldb/source/API/SBDeclaration.cpp
@@ -1,4 +1,5 @@
-//===-- SBDeclaration.cpp -----------------------------------------*- C++ -*-===//
+//===-- SBDeclaration.cpp -----------------------------------------*- C++
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,192 +19,135 @@
 using namespace lldb;
 using namespace lldb_private;
 
+SBDeclaration::SBDeclaration() : m_opaque_ap() {}
 
-SBDeclaration::SBDeclaration () :
-    m_opaque_ap ()
-{
+SBDeclaration::SBDeclaration(const SBDeclaration &rhs) : m_opaque_ap() {
+  if (rhs.IsValid())
+    ref() = rhs.ref();
 }
 
-SBDeclaration::SBDeclaration (const SBDeclaration &rhs) :
-    m_opaque_ap ()
-{
-    if (rhs.IsValid())
-        ref() = rhs.ref();
+SBDeclaration::SBDeclaration(const lldb_private::Declaration *lldb_object_ptr)
+    : m_opaque_ap() {
+  if (lldb_object_ptr)
+    ref() = *lldb_object_ptr;
 }
 
-SBDeclaration::SBDeclaration (const lldb_private::Declaration *lldb_object_ptr) :
-    m_opaque_ap ()
-{
-    if (lldb_object_ptr)
-        ref() = *lldb_object_ptr;
+const SBDeclaration &SBDeclaration::operator=(const SBDeclaration &rhs) {
+  if (this != &rhs) {
+    if (rhs.IsValid())
+      ref() = rhs.ref();
+    else
+      m_opaque_ap.reset();
+  }
+  return *this;
 }
 
-const SBDeclaration &
-SBDeclaration::operator = (const SBDeclaration &rhs)
-{
-    if (this != &rhs)
-    {
-        if (rhs.IsValid())
-            ref() = rhs.ref();
-        else
-            m_opaque_ap.reset();
-    }
-    return *this;
+void SBDeclaration::SetDeclaration(
+    const lldb_private::Declaration &lldb_object_ref) {
+  ref() = lldb_object_ref;
 }
 
-void
-SBDeclaration::SetDeclaration (const lldb_private::Declaration &lldb_object_ref)
-{
-    ref() = lldb_object_ref;
+SBDeclaration::~SBDeclaration() {}
+
+bool SBDeclaration::IsValid() const {
+  return m_opaque_ap.get() && m_opaque_ap->IsValid();
 }
 
+SBFileSpec SBDeclaration::GetFileSpec() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-SBDeclaration::~SBDeclaration ()
-{
-}
+  SBFileSpec sb_file_spec;
+  if (m_opaque_ap.get() && m_opaque_ap->GetFile())
+    sb_file_spec.SetFileSpec(m_opaque_ap->GetFile());
 
+  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());
+  }
 
-bool
-SBDeclaration::IsValid () const
-{
-    return m_opaque_ap.get() && m_opaque_ap->IsValid();
+  return sb_file_spec;
 }
 
+uint32_t SBDeclaration::GetLine() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-SBFileSpec
-SBDeclaration::GetFileSpec () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+  uint32_t line = 0;
+  if (m_opaque_ap.get())
+    line = m_opaque_ap->GetLine();
 
-    SBFileSpec sb_file_spec;
-    if (m_opaque_ap.get() && m_opaque_ap->GetFile())
-        sb_file_spec.SetFileSpec(m_opaque_ap->GetFile());
+  if (log)
+    log->Printf("SBLineEntry(%p)::GetLine () => %u",
+                static_cast<void *>(m_opaque_ap.get()), line);
 
-    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;
+  return line;
 }
 
-uint32_t
-SBDeclaration::GetLine () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    uint32_t line = 0;
-    if (m_opaque_ap.get())
-        line = m_opaque_ap->GetLine();
-
-    if (log)
-        log->Printf ("SBLineEntry(%p)::GetLine () => %u",
-                     static_cast<void*>(m_opaque_ap.get()), line);
+uint32_t SBDeclaration::GetColumn() const {
+  if (m_opaque_ap.get())
+    return m_opaque_ap->GetColumn();
+  return 0;
+}
 
-    return line;
+void SBDeclaration::SetFileSpec(lldb::SBFileSpec filespec) {
+  if (filespec.IsValid())
+    ref().SetFile(filespec.ref());
+  else
+    ref().SetFile(FileSpec());
 }
+void SBDeclaration::SetLine(uint32_t line) { ref().SetLine(line); }
 
+void SBDeclaration::SetColumn(uint32_t column) { ref().SetColumn(column); }
 
-uint32_t
-SBDeclaration::GetColumn () const
-{
-    if (m_opaque_ap.get())
-        return m_opaque_ap->GetColumn();
-    return 0;
-}
+bool SBDeclaration::operator==(const SBDeclaration &rhs) const {
+  lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
+  lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
 
-void
-SBDeclaration::SetFileSpec (lldb::SBFileSpec filespec)
-{
-    if (filespec.IsValid())
-        ref().SetFile(filespec.ref());
-    else
-        ref().SetFile(FileSpec());
-}
-void
-SBDeclaration::SetLine (uint32_t line)
-{
-    ref().SetLine(line);
-}
+  if (lhs_ptr && rhs_ptr)
+    return lldb_private::Declaration::Compare(*lhs_ptr, *rhs_ptr) == 0;
 
-void
-SBDeclaration::SetColumn (uint32_t column)
-{
-    ref().SetColumn(column);
+  return lhs_ptr == rhs_ptr;
 }
 
+bool SBDeclaration::operator!=(const SBDeclaration &rhs) const {
+  lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
+  lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
 
+  if (lhs_ptr && rhs_ptr)
+    return lldb_private::Declaration::Compare(*lhs_ptr, *rhs_ptr) != 0;
 
-bool
-SBDeclaration::operator == (const SBDeclaration &rhs) const
-{
-    lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
-    lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
-    
-    if (lhs_ptr && rhs_ptr)
-        return lldb_private::Declaration::Compare (*lhs_ptr, *rhs_ptr) == 0;
-    
-    return lhs_ptr == rhs_ptr;
+  return lhs_ptr != rhs_ptr;
 }
 
-bool
-SBDeclaration::operator != (const SBDeclaration &rhs) const
-{
-    lldb_private::Declaration *lhs_ptr = m_opaque_ap.get();
-    lldb_private::Declaration *rhs_ptr = rhs.m_opaque_ap.get();
-    
-    if (lhs_ptr && rhs_ptr)
-        return lldb_private::Declaration::Compare (*lhs_ptr, *rhs_ptr) != 0;
-    
-    return lhs_ptr != rhs_ptr;
+const lldb_private::Declaration *SBDeclaration::operator->() const {
+  return m_opaque_ap.get();
 }
 
-const lldb_private::Declaration *
-SBDeclaration::operator->() const
-{
-    return m_opaque_ap.get();
+lldb_private::Declaration &SBDeclaration::ref() {
+  if (m_opaque_ap.get() == NULL)
+    m_opaque_ap.reset(new lldb_private::Declaration());
+  return *m_opaque_ap;
 }
 
-lldb_private::Declaration &
-SBDeclaration::ref()
-{
-    if (m_opaque_ap.get() == NULL)
-        m_opaque_ap.reset (new lldb_private::Declaration ());
-    return *m_opaque_ap;
+const lldb_private::Declaration &SBDeclaration::ref() const {
+  return *m_opaque_ap;
 }
 
-const lldb_private::Declaration &
-SBDeclaration::ref() const
-{
-    return *m_opaque_ap;
-}
+bool SBDeclaration::GetDescription(SBStream &description) {
+  Stream &strm = description.ref();
 
-bool
-SBDeclaration::GetDescription (SBStream &description)
-{
-    Stream &strm = description.ref();
-    
-    if (m_opaque_ap.get())
-    {
-        char file_path[PATH_MAX*2];
-        m_opaque_ap->GetFile().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;
-}
+  if (m_opaque_ap.get()) {
+    char file_path[PATH_MAX * 2];
+    m_opaque_ap->GetFile().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");
 
-lldb_private::Declaration *
-SBDeclaration::get ()
-{
-    return m_opaque_ap.get();
+  return true;
 }
+
+lldb_private::Declaration *SBDeclaration::get() { return m_opaque_ap.get(); }