Fixed the way set/show variables were being accessed to being natively

accessed by the objects that own the settings. The previous approach wasn't
very usable and made for a lot of unnecessary code just to access variables
that were already owned by the objects.

While I fixed those things, I saw that CommandObject objects should really
have a reference to their command interpreter so they can access the terminal
with if they want to output usaage. Fixed up all CommandObjects to take
an interpreter and cleaned up the API to not need the interpreter to be
passed in.

Fixed the disassemble command to output the usage if no options are passed
down and arguments are passed (all disassebmle variants take options, there
are no "args only").

llvm-svn: 114252
This commit is contained in:
Greg Clayton
2010-09-18 01:14:36 +00:00
parent 9a587aaaa9
commit a701509229
60 changed files with 1259 additions and 1132 deletions

View File

@@ -27,8 +27,9 @@ using namespace lldb_private;
// CommandObjectScript
//-------------------------------------------------------------------------
CommandObjectScript::CommandObjectScript (ScriptLanguage script_lang) :
CommandObject ("script",
CommandObjectScript::CommandObjectScript (CommandInterpreter &interpreter, ScriptLanguage script_lang) :
CommandObject (interpreter,
"script",
"Pass an expression to the script interpreter for evaluation and return the results. Drop into the interactive interpreter if no expression is given.",
"script [<script-expression-for-evaluation>]"),
m_script_lang (script_lang),
@@ -43,12 +44,11 @@ CommandObjectScript::~CommandObjectScript ()
bool
CommandObjectScript::ExecuteRawCommandString
(
CommandInterpreter &interpreter,
const char *command,
CommandReturnObject &result
)
{
ScriptInterpreter *script_interpreter = GetInterpreter (interpreter);
ScriptInterpreter *script_interpreter = GetInterpreter ();
if (script_interpreter == NULL)
{
@@ -57,13 +57,13 @@ CommandObjectScript::ExecuteRawCommandString
}
if (command == NULL || command[0] == '\0') {
script_interpreter->ExecuteInterpreterLoop (interpreter);
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 (interpreter, command, &result))
if (script_interpreter->ExecuteOneLine (command, &result))
result.SetStatus(eReturnStatusSuccessFinishNoResult);
else
result.SetStatus(eReturnStatusFailed);
@@ -80,7 +80,6 @@ CommandObjectScript::WantsRawCommandString()
bool
CommandObjectScript::Execute
(
CommandInterpreter &interpreter,
Args& command,
CommandReturnObject &result
)
@@ -91,18 +90,18 @@ CommandObjectScript::Execute
ScriptInterpreter *
CommandObjectScript::GetInterpreter (CommandInterpreter &interpreter)
CommandObjectScript::GetInterpreter ()
{
if (m_interpreter_ap.get() == NULL)
{
switch (m_script_lang)
{
case eScriptLanguagePython:
m_interpreter_ap.reset (new ScriptInterpreterPython (interpreter));
m_interpreter_ap.reset (new ScriptInterpreterPython (m_interpreter));
break;
case eScriptLanguageNone:
m_interpreter_ap.reset (new ScriptInterpreterNone (interpreter));
m_interpreter_ap.reset (new ScriptInterpreterNone (m_interpreter));
break;
}
}