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/API/SBSourceManager.cpp | 173 ++++++++++++++---------------------- 1 file changed, 67 insertions(+), 106 deletions(-) (limited to 'lldb/source/API/SBSourceManager.cpp') diff --git a/lldb/source/API/SBSourceManager.cpp b/lldb/source/API/SBSourceManager.cpp index 8196b91d00b..69220760c9f 100644 --- a/lldb/source/API/SBSourceManager.cpp +++ b/lldb/source/API/SBSourceManager.cpp @@ -7,138 +7,99 @@ // //===----------------------------------------------------------------------===// -#include "lldb/API/SBDebugger.h" #include "lldb/API/SBSourceManager.h" -#include "lldb/API/SBTarget.h" +#include "lldb/API/SBDebugger.h" #include "lldb/API/SBStream.h" +#include "lldb/API/SBTarget.h" #include "lldb/API/SBFileSpec.h" #include "lldb/Core/Debugger.h" +#include "lldb/Core/SourceManager.h" #include "lldb/Core/Stream.h" #include "lldb/Core/StreamFile.h" -#include "lldb/Core/SourceManager.h" #include "lldb/Target/Target.h" -namespace lldb_private -{ - class SourceManagerImpl - { - public: - SourceManagerImpl (const lldb::DebuggerSP &debugger_sp) : - m_debugger_wp (debugger_sp), - m_target_wp () - { - } - - SourceManagerImpl (const lldb::TargetSP &target_sp) : - m_debugger_wp (), - m_target_wp (target_sp) - { - } - - SourceManagerImpl (const SourceManagerImpl &rhs) - { - if (&rhs == this) - return; - m_debugger_wp = rhs.m_debugger_wp; - m_target_wp = rhs.m_target_wp; - } - - size_t - DisplaySourceLinesWithLineNumbers (const lldb_private::FileSpec &file, +namespace lldb_private { +class SourceManagerImpl { +public: + SourceManagerImpl(const lldb::DebuggerSP &debugger_sp) + : m_debugger_wp(debugger_sp), m_target_wp() {} + + SourceManagerImpl(const lldb::TargetSP &target_sp) + : m_debugger_wp(), m_target_wp(target_sp) {} + + SourceManagerImpl(const SourceManagerImpl &rhs) { + if (&rhs == this) + return; + m_debugger_wp = rhs.m_debugger_wp; + m_target_wp = rhs.m_target_wp; + } + + size_t DisplaySourceLinesWithLineNumbers(const lldb_private::FileSpec &file, uint32_t line, uint32_t context_before, uint32_t context_after, const char *current_line_cstr, - lldb_private::Stream *s) - { - if (!file) - return 0; - - lldb::TargetSP target_sp (m_target_wp.lock()); - if (target_sp) - { - return target_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file, - line, - context_before, - context_after, - current_line_cstr, - s); - } - else - { - lldb::DebuggerSP debugger_sp (m_debugger_wp.lock()); - if (debugger_sp) - { - return debugger_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers (file, - line, - context_before, - context_after, - current_line_cstr, - s); - } - } - return 0; - } - - private: - lldb::DebuggerWP m_debugger_wp; - lldb::TargetWP m_target_wp; - - }; + lldb_private::Stream *s) { + if (!file) + return 0; + + lldb::TargetSP target_sp(m_target_wp.lock()); + if (target_sp) { + return target_sp->GetSourceManager().DisplaySourceLinesWithLineNumbers( + file, line, context_before, context_after, current_line_cstr, s); + } else { + lldb::DebuggerSP debugger_sp(m_debugger_wp.lock()); + if (debugger_sp) { + return debugger_sp->GetSourceManager() + .DisplaySourceLinesWithLineNumbers(file, line, context_before, + context_after, current_line_cstr, + s); + } + } + return 0; + } + +private: + lldb::DebuggerWP m_debugger_wp; + lldb::TargetWP m_target_wp; +}; } using namespace lldb; using namespace lldb_private; -SBSourceManager::SBSourceManager (const SBDebugger &debugger) -{ - m_opaque_ap.reset(new SourceManagerImpl (debugger.get_sp())); +SBSourceManager::SBSourceManager(const SBDebugger &debugger) { + m_opaque_ap.reset(new SourceManagerImpl(debugger.get_sp())); } -SBSourceManager::SBSourceManager (const SBTarget &target) -{ - m_opaque_ap.reset(new SourceManagerImpl (target.GetSP())); +SBSourceManager::SBSourceManager(const SBTarget &target) { + m_opaque_ap.reset(new SourceManagerImpl(target.GetSP())); } -SBSourceManager::SBSourceManager (const SBSourceManager &rhs) -{ - if (&rhs == this) - return; - - m_opaque_ap.reset(new SourceManagerImpl (*(rhs.m_opaque_ap.get()))); -} +SBSourceManager::SBSourceManager(const SBSourceManager &rhs) { + if (&rhs == this) + return; -const lldb::SBSourceManager & -SBSourceManager::operator = (const lldb::SBSourceManager &rhs) -{ - m_opaque_ap.reset (new SourceManagerImpl (*(rhs.m_opaque_ap.get()))); - return *this; + m_opaque_ap.reset(new SourceManagerImpl(*(rhs.m_opaque_ap.get()))); } -SBSourceManager::~SBSourceManager() -{ +const lldb::SBSourceManager &SBSourceManager:: +operator=(const lldb::SBSourceManager &rhs) { + m_opaque_ap.reset(new SourceManagerImpl(*(rhs.m_opaque_ap.get()))); + return *this; } -size_t -SBSourceManager::DisplaySourceLinesWithLineNumbers -( - const SBFileSpec &file, - uint32_t line, - uint32_t context_before, - uint32_t context_after, - const char *current_line_cstr, - SBStream &s -) -{ - if (m_opaque_ap.get() == NULL) - return 0; - - return m_opaque_ap->DisplaySourceLinesWithLineNumbers (file.ref(), - line, - context_before, - context_after, - current_line_cstr, - s.get()); +SBSourceManager::~SBSourceManager() {} + +size_t SBSourceManager::DisplaySourceLinesWithLineNumbers( + const SBFileSpec &file, uint32_t line, uint32_t context_before, + uint32_t context_after, const char *current_line_cstr, SBStream &s) { + if (m_opaque_ap.get() == NULL) + return 0; + + return m_opaque_ap->DisplaySourceLinesWithLineNumbers( + file.ref(), line, context_before, context_after, current_line_cstr, + s.get()); } -- cgit v1.2.3