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/Interpreter/ScriptInterpreter.cpp | 116 +++++++++++--------------- 1 file changed, 48 insertions(+), 68 deletions(-) (limited to 'lldb/source/Interpreter/ScriptInterpreter.cpp') diff --git a/lldb/source/Interpreter/ScriptInterpreter.cpp b/lldb/source/Interpreter/ScriptInterpreter.cpp index f1ec50e..87f4dac 100644 --- a/lldb/source/Interpreter/ScriptInterpreter.cpp +++ b/lldb/source/Interpreter/ScriptInterpreter.cpp @@ -9,9 +9,9 @@ #include "lldb/Interpreter/ScriptInterpreter.h" -#include -#include #include +#include +#include #include "lldb/Core/Error.h" #include "lldb/Core/Stream.h" @@ -22,88 +22,68 @@ using namespace lldb; using namespace lldb_private; -ScriptInterpreter::ScriptInterpreter (CommandInterpreter &interpreter, lldb::ScriptLanguage script_lang) : - m_interpreter (interpreter), - m_script_lang (script_lang) -{ -} +ScriptInterpreter::ScriptInterpreter(CommandInterpreter &interpreter, + lldb::ScriptLanguage script_lang) + : m_interpreter(interpreter), m_script_lang(script_lang) {} -ScriptInterpreter::~ScriptInterpreter () -{ -} +ScriptInterpreter::~ScriptInterpreter() {} -CommandInterpreter & -ScriptInterpreter::GetCommandInterpreter () -{ - return m_interpreter; +CommandInterpreter &ScriptInterpreter::GetCommandInterpreter() { + return m_interpreter; } -void -ScriptInterpreter::CollectDataForBreakpointCommandCallback -( +void ScriptInterpreter::CollectDataForBreakpointCommandCallback( std::vector &bp_options_vec, - CommandReturnObject &result -) -{ - result.SetStatus (eReturnStatusFailed); - result.AppendError ("ScriptInterpreter::GetScriptCommands(StringList &) is not implemented."); + CommandReturnObject &result) { + result.SetStatus(eReturnStatusFailed); + result.AppendError( + "ScriptInterpreter::GetScriptCommands(StringList &) is not implemented."); } -void -ScriptInterpreter::CollectDataForWatchpointCommandCallback -( - WatchpointOptions *bp_options, - CommandReturnObject &result -) -{ - result.SetStatus (eReturnStatusFailed); - result.AppendError ("ScriptInterpreter::GetScriptCommands(StringList &) is not implemented."); +void ScriptInterpreter::CollectDataForWatchpointCommandCallback( + WatchpointOptions *bp_options, CommandReturnObject &result) { + result.SetStatus(eReturnStatusFailed); + result.AppendError( + "ScriptInterpreter::GetScriptCommands(StringList &) is not implemented."); } -std::string -ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language) -{ - std::string return_value; +std::string ScriptInterpreter::LanguageToString(lldb::ScriptLanguage language) { + std::string return_value; - switch (language) - { - case eScriptLanguageNone: - return_value = "None"; - break; - case eScriptLanguagePython: - return_value = "Python"; - break; - } + switch (language) { + case eScriptLanguageNone: + return_value = "None"; + break; + case eScriptLanguagePython: + return_value = "Python"; + break; + } - return return_value; + return return_value; } -Error -ScriptInterpreter::SetBreakpointCommandCallback (std::vector &bp_options_vec, - const char *callback_text) -{ - Error return_error; - for (BreakpointOptions *bp_options : bp_options_vec) - { - return_error = SetBreakpointCommandCallback(bp_options, callback_text); - if (return_error.Success()) - break; - } - return return_error; +Error ScriptInterpreter::SetBreakpointCommandCallback( + std::vector &bp_options_vec, + const char *callback_text) { + Error return_error; + for (BreakpointOptions *bp_options : bp_options_vec) { + return_error = SetBreakpointCommandCallback(bp_options, callback_text); + if (return_error.Success()) + break; + } + return return_error; } -void -ScriptInterpreter::SetBreakpointCommandCallbackFunction (std::vector &bp_options_vec, - const char *function_name) -{ - for (BreakpointOptions *bp_options : bp_options_vec) - { - SetBreakpointCommandCallbackFunction(bp_options, function_name); - } +void ScriptInterpreter::SetBreakpointCommandCallbackFunction( + std::vector &bp_options_vec, + const char *function_name) { + for (BreakpointOptions *bp_options : bp_options_vec) { + SetBreakpointCommandCallbackFunction(bp_options, function_name); + } } std::unique_ptr -ScriptInterpreter::AcquireInterpreterLock () -{ - return std::unique_ptr(new ScriptInterpreterLocker()); +ScriptInterpreter::AcquireInterpreterLock() { + return std::unique_ptr( + new ScriptInterpreterLocker()); } -- cgit v1.1