diff options
Diffstat (limited to 'lldb/source/Interpreter')
| -rw-r--r-- | lldb/source/Interpreter/CommandObject.cpp | 7 | ||||
| -rw-r--r-- | lldb/source/Interpreter/Options.cpp | 15 |
2 files changed, 9 insertions, 13 deletions
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp index e4f4689044b..f93ed6e0344 100644 --- a/lldb/source/Interpreter/CommandObject.cpp +++ b/lldb/source/Interpreter/CommandObject.cpp @@ -198,7 +198,7 @@ CommandObject::ParseOptions else { // No error string, output the usage information into result - options->GenerateOptionUsage (m_interpreter, result.GetErrorStream(), this); + options->GenerateOptionUsage (result.GetErrorStream(), this); } // Set the return status to failed (this was an error). result.SetStatus (eReturnStatusFailed); @@ -356,8 +356,7 @@ CommandObject::HandleCompletion input.DeleteArgumentAtIndex(input.GetArgumentCount() - 1); bool handled_by_options; - handled_by_options = cur_options->HandleOptionCompletion (m_interpreter, - input, + handled_by_options = cur_options->HandleOptionCompletion (input, opt_element_vector, cursor_index, cursor_char_position, @@ -407,7 +406,7 @@ CommandObject::HelpTextContainsWord (const char *search_word) && GetOptions() != NULL) { StreamString usage_help; - GetOptions()->GenerateOptionUsage (m_interpreter, usage_help, this); + GetOptions()->GenerateOptionUsage (usage_help, this); if (usage_help.GetSize() > 0) { const char *usage_text = usage_help.GetData(); diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp index 3bc553d4bb3..3c14cc0d44e 100644 --- a/lldb/source/Interpreter/Options.cpp +++ b/lldb/source/Interpreter/Options.cpp @@ -29,7 +29,8 @@ using namespace lldb_private; //------------------------------------------------------------------------- // Options //------------------------------------------------------------------------- -Options::Options () : +Options::Options (CommandInterpreter &interpreter) : + m_interpreter (interpreter), m_getopt_table () { BuildValidOptionSets(); @@ -362,12 +363,11 @@ Options::OutputFormattedUsageText void Options::GenerateOptionUsage ( - CommandInterpreter &interpreter, Stream &strm, CommandObject *cmd ) { - const uint32_t screen_width = interpreter.GetDebugger().GetTerminalWidth(); + const uint32_t screen_width = m_interpreter.GetDebugger().GetTerminalWidth(); const OptionDefinition *full_options_table = GetDefinitions(); const uint32_t save_indent_level = strm.GetIndentLevel(); @@ -656,7 +656,6 @@ Options::VerifyPartialOptions (CommandReturnObject &result) bool Options::HandleOptionCompletion ( - CommandInterpreter &interpreter, Args &input, OptionElementVector &opt_element_vector, int cursor_index, @@ -778,8 +777,7 @@ Options::HandleOptionCompletion if (opt_defs_index != -1) { - HandleOptionArgumentCompletion (interpreter, - input, + HandleOptionArgumentCompletion (input, cursor_index, strlen (input.GetArgumentAtIndex(cursor_index)), opt_element_vector, @@ -809,7 +807,6 @@ Options::HandleOptionCompletion bool Options::HandleOptionArgumentCompletion ( - CommandInterpreter &interpreter, Args &input, int cursor_index, int char_pos, @@ -868,7 +865,7 @@ Options::HandleOptionArgumentCompletion if (module_name) { FileSpec module_spec(module_name, false); - lldb::TargetSP target_sp = interpreter.GetDebugger().GetSelectedTarget(); + lldb::TargetSP target_sp = m_interpreter.GetDebugger().GetSelectedTarget(); // Search filters require a target... if (target_sp != NULL) filter_ap.reset (new SearchFilterByModule (target_sp, module_spec)); @@ -878,7 +875,7 @@ Options::HandleOptionArgumentCompletion } } - return CommandCompletions::InvokeCommonCompletionCallbacks (interpreter, + return CommandCompletions::InvokeCommonCompletionCallbacks (m_interpreter, completion_mask, input.GetArgumentAtIndex (opt_arg_pos), match_start_point, |
