nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Interpreter/ScriptInterpreterPython.cpp
View File

@@ -144,7 +144,7 @@ _check_and_flush (FILE *stream)
}
ScriptInterpreterPython::ScriptInterpreterPython (CommandInterpreter &interpreter) :
ScriptInterpreter (eScriptLanguagePython),
ScriptInterpreter (interpreter, eScriptLanguagePython),
m_compiled_module (NULL),
m_termios_valid (false)
{
@@ -254,9 +254,7 @@ ScriptInterpreterPython::~ScriptInterpreterPython ()
}
bool
ScriptInterpreterPython::ExecuteOneLine (CommandInterpreter &interpreter,
const char *command,
CommandReturnObject *result = 0)
ScriptInterpreterPython::ExecuteOneLine (const char *command, CommandReturnObject *result)
{
if (command)
{
@@ -357,11 +355,11 @@ ScriptInterpreterPython::InputReaderCallback
void
ScriptInterpreterPython::ExecuteInterpreterLoop (CommandInterpreter &interpreter)
ScriptInterpreterPython::ExecuteInterpreterLoop ()
{
Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
Debugger &debugger = interpreter.GetDebugger();
Debugger &debugger = m_interpreter.GetDebugger();
// At the moment, the only time the debugger does not have an input file handle is when this is called
// directly from Python, in which case it is both dangerous and unnecessary (not to mention confusing) to
@@ -384,7 +382,7 @@ ScriptInterpreterPython::ExecuteInterpreterLoop (CommandInterpreter &interpreter
if (error.Success())
{
debugger.PushInputReader (reader_sp);
ExecuteOneLine (interpreter, "run_python_interpreter(ConsoleDict)");
ExecuteOneLine ("run_python_interpreter(ConsoleDict)", NULL);
debugger.PopInputReader (reader_sp);
}
}
@@ -643,11 +641,10 @@ ScriptInterpreterPython::GenerateBreakpointOptionsCommandCallback
}
void
ScriptInterpreterPython::CollectDataForBreakpointCommandCallback (CommandInterpreter &interpreter,
BreakpointOptions *bp_options,
ScriptInterpreterPython::CollectDataForBreakpointCommandCallback (BreakpointOptions *bp_options,
CommandReturnObject &result)
{
Debugger &debugger = interpreter.GetDebugger();
Debugger &debugger = m_interpreter.GetDebugger();
InputReaderSP reader_sp (new InputReader (debugger));
if (reader_sp)
@@ -677,8 +674,7 @@ ScriptInterpreterPython::CollectDataForBreakpointCommandCallback (CommandInterpr
// Set a Python one-liner as the callback for the breakpoint.
void
ScriptInterpreterPython::SetBreakpointCommandCallback (CommandInterpreter &interpreter,
BreakpointOptions *bp_options,
ScriptInterpreterPython::SetBreakpointCommandCallback (BreakpointOptions *bp_options,
const char *oneliner)
{
std::auto_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());