*** 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
This commit is contained in:
Kate Stone
2016-09-06 20:57:50 +00:00
parent d5aa733769
commit b9c1b51e45
2780 changed files with 556690 additions and 597060 deletions

View File

@@ -30,61 +30,57 @@ using namespace lldb_private;
// CommandObjectScript
//-------------------------------------------------------------------------
CommandObjectScript::CommandObjectScript(CommandInterpreter &interpreter, ScriptLanguage script_lang)
: CommandObjectRaw(interpreter, "script", "Invoke the script interpreter with provided code and display any "
"results. Start the interactive interpreter if no code is supplied.",
"script [<script-code>]")
{
}
CommandObjectScript::CommandObjectScript(CommandInterpreter &interpreter,
ScriptLanguage script_lang)
: CommandObjectRaw(
interpreter, "script",
"Invoke the script interpreter with provided code and display any "
"results. Start the interactive interpreter if no code is supplied.",
"script [<script-code>]") {}
CommandObjectScript::~CommandObjectScript ()
{
}
CommandObjectScript::~CommandObjectScript() {}
bool
CommandObjectScript::DoExecute
(
const char *command,
CommandReturnObject &result
)
{
bool CommandObjectScript::DoExecute(const char *command,
CommandReturnObject &result) {
#ifdef LLDB_DISABLE_PYTHON
// if we ever support languages other than Python this simple #ifdef won't work
result.AppendError("your copy of LLDB does not support scripting.");
result.SetStatus (eReturnStatusFailed);
return false;
// if we ever support languages other than Python this simple #ifdef won't
// work
result.AppendError("your copy of LLDB does not support scripting.");
result.SetStatus(eReturnStatusFailed);
return false;
#else
if (m_interpreter.GetDebugger().GetScriptLanguage() == lldb::eScriptLanguageNone)
{
result.AppendError("the script-lang setting is set to none - scripting not available");
result.SetStatus (eReturnStatusFailed);
return false;
}
ScriptInterpreter *script_interpreter = m_interpreter.GetScriptInterpreter ();
if (m_interpreter.GetDebugger().GetScriptLanguage() ==
lldb::eScriptLanguageNone) {
result.AppendError(
"the script-lang setting is set to none - scripting not available");
result.SetStatus(eReturnStatusFailed);
return false;
}
if (script_interpreter == nullptr)
{
result.AppendError("no script interpreter");
result.SetStatus (eReturnStatusFailed);
return false;
}
ScriptInterpreter *script_interpreter = m_interpreter.GetScriptInterpreter();
DataVisualization::ForceUpdate(); // script might change Python code we use for formatting.. make sure we keep up to date with it
if (command == nullptr || command[0] == '\0')
{
script_interpreter->ExecuteInterpreterLoop ();
result.SetStatus (eReturnStatusSuccessFinishNoResult);
return result.Succeeded();
}
if (script_interpreter == nullptr) {
result.AppendError("no script interpreter");
result.SetStatus(eReturnStatusFailed);
return false;
}
// We can do better when reporting the status of one-liner script execution.
if (script_interpreter->ExecuteOneLine (command, &result))
result.SetStatus(eReturnStatusSuccessFinishNoResult);
else
result.SetStatus(eReturnStatusFailed);
DataVisualization::ForceUpdate(); // script might change Python code we use
// for formatting.. make sure we keep up to
// date with it
if (command == nullptr || command[0] == '\0') {
script_interpreter->ExecuteInterpreterLoop();
result.SetStatus(eReturnStatusSuccessFinishNoResult);
return result.Succeeded();
}
// We can do better when reporting the status of one-liner script execution.
if (script_interpreter->ExecuteOneLine(command, &result))
result.SetStatus(eReturnStatusSuccessFinishNoResult);
else
result.SetStatus(eReturnStatusFailed);
return result.Succeeded();
#endif
}