diff options
Diffstat (limited to 'lldb/source/Commands')
24 files changed, 122 insertions, 122 deletions
diff --git a/lldb/source/Commands/CommandObjectArgs.cpp b/lldb/source/Commands/CommandObjectArgs.cpp index 6075e10ca58..6810b45300c 100644 --- a/lldb/source/Commands/CommandObjectArgs.cpp +++ b/lldb/source/Commands/CommandObjectArgs.cpp @@ -71,7 +71,7 @@ CommandObjectArgs::CommandOptions::ResetOptionValues () Options::ResetOptionValues(); } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectArgs::CommandOptions::GetDefinitions () { return g_option_table; @@ -265,7 +265,7 @@ CommandObjectArgs::Execute return result.Succeeded(); } -lldb::OptionDefinition +OptionDefinition CommandObjectArgs::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."}, diff --git a/lldb/source/Commands/CommandObjectArgs.h b/lldb/source/Commands/CommandObjectArgs.h index 70f73f041d8..544d343df22 100644 --- a/lldb/source/Commands/CommandObjectArgs.h +++ b/lldb/source/Commands/CommandObjectArgs.h @@ -39,12 +39,12 @@ namespace lldb_private { void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; }; CommandObjectArgs (CommandInterpreter &interpreter); diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 598e6a3ea8b..c7bbf85c0b0 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -70,7 +70,7 @@ CommandObjectBreakpointSet::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointSet::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, @@ -127,7 +127,7 @@ CommandObjectBreakpointSet::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointSet::CommandOptions::GetDefinitions () { return g_option_table; @@ -649,7 +649,7 @@ CommandObjectBreakpointList::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "internal", 'i', no_argument, NULL, 0, eArgTypeNone, @@ -669,7 +669,7 @@ CommandObjectBreakpointList::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointList::CommandOptions::GetDefinitions () { return g_option_table; @@ -1060,7 +1060,7 @@ CommandObjectBreakpointClear::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointClear::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename, @@ -1072,7 +1072,7 @@ CommandObjectBreakpointClear::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointClear::CommandOptions::GetDefinitions () { return g_option_table; @@ -1376,7 +1376,7 @@ CommandObjectBreakpointModify::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointModify::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "ignore-count", 'i', required_argument, NULL, NULL, eArgTypeCount, "Set the number of times this breakpoint is skipped before stopping." }, @@ -1390,7 +1390,7 @@ CommandObjectBreakpointModify::CommandOptions::g_option_table[] = { 0, false, NULL, 0 , 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointModify::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectBreakpoint.h b/lldb/source/Commands/CommandObjectBreakpoint.h index 6f31a5ffc29..fdfd1d90bf6 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.h +++ b/lldb/source/Commands/CommandObjectBreakpoint.h @@ -87,12 +87,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -153,12 +153,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -254,12 +254,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition * + const OptionDefinition * GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -314,12 +314,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp index f88264b6c1b..3af812c2d91 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp @@ -48,7 +48,7 @@ CommandObjectBreakpointCommandAdd::CommandOptions::~CommandOptions () // FIXME: "script-type" needs to have its contents determined dynamically, so somebody can add a new scripting // language to lldb and have it pickable here without having to change this enumeration by hand and rebuild lldb proper. -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_script_option_enumeration[4] = { { eScriptLanguageNone, "command", "Commands are in the lldb command interpreter language"}, @@ -57,7 +57,7 @@ g_script_option_enumeration[4] = { 0, NULL, NULL } }; -lldb::OptionDefinition +OptionDefinition CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "one-liner", 'o', required_argument, NULL, NULL, eArgTypeOneLiner, @@ -72,7 +72,7 @@ CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectBreakpointCommandAdd::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.h b/lldb/source/Commands/CommandObjectBreakpointCommand.h index 51131d2ee04..5e3e1a1abff 100644 --- a/lldb/source/Commands/CommandObjectBreakpointCommand.h +++ b/lldb/source/Commands/CommandObjectBreakpointCommand.h @@ -106,12 +106,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp index 9230aea8ba1..49fc0222bbd 100644 --- a/lldb/source/Commands/CommandObjectCommands.cpp +++ b/lldb/source/Commands/CommandObjectCommands.cpp @@ -75,7 +75,7 @@ private: m_stop_on_continue = true; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -83,7 +83,7 @@ private: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -93,7 +93,7 @@ private: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; CommandOptions m_options; @@ -165,7 +165,7 @@ public: } }; -lldb::OptionDefinition +OptionDefinition CommandObjectCommandsSource::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', required_argument, NULL, 0, eArgTypeBoolean, "If true, stop executing commands on error."}, diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp index ecfd30f648e..26752b86fbd 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.cpp +++ b/lldb/source/Commands/CommandObjectDisassemble.cpp @@ -136,13 +136,13 @@ CommandObjectDisassemble::CommandOptions::ResetOptionValues () raw = false; } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectDisassemble::CommandOptions::GetDefinitions () { return g_option_table; } -lldb::OptionDefinition +OptionDefinition CommandObjectDisassemble::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "bytes", 'b', no_argument, NULL, 0, eArgTypeNone, "Show opcode bytes when disassembling."}, diff --git a/lldb/source/Commands/CommandObjectDisassemble.h b/lldb/source/Commands/CommandObjectDisassemble.h index a36ae88cb15..4794ee5fd71 100644 --- a/lldb/source/Commands/CommandObjectDisassemble.h +++ b/lldb/source/Commands/CommandObjectDisassemble.h @@ -41,7 +41,7 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); bool show_mixed; // Show mixed source/assembly @@ -53,7 +53,7 @@ public: lldb::addr_t m_start_addr; lldb::addr_t m_end_addr; bool m_at_pc; - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; }; CommandObjectDisassemble (CommandInterpreter &interpreter); diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp index 0daad3a5260..e7b11837c8e 100644 --- a/lldb/source/Commands/CommandObjectExpression.cpp +++ b/lldb/source/Commands/CommandObjectExpression.cpp @@ -105,7 +105,7 @@ CommandObjectExpression::CommandOptions::ResetOptionValues () show_summary = true; } -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectExpression::CommandOptions::GetDefinitions () { return g_option_table; @@ -236,7 +236,7 @@ CommandObjectExpression::EvaluateExpression { lldb::ValueObjectSP result_valobj_sp; - lldb::ExecutionResults exe_results; + ExecutionResults exe_results; bool keep_in_memory = true; @@ -375,7 +375,7 @@ CommandObjectExpression::ExecuteRawCommandString return false; } -lldb::OptionDefinition +OptionDefinition CommandObjectExpression::CommandOptions::g_option_table[] = { //{ LLDB_OPT_SET_ALL, false, "language", 'l', required_argument, NULL, 0, "[c|c++|objc|objc++]", "Sets the language to use when parsing the expression."}, diff --git a/lldb/source/Commands/CommandObjectExpression.h b/lldb/source/Commands/CommandObjectExpression.h index 9cbdf34f570..5ddb0db6ddc 100644 --- a/lldb/source/Commands/CommandObjectExpression.h +++ b/lldb/source/Commands/CommandObjectExpression.h @@ -40,12 +40,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; //Language language; lldb::Encoding encoding; lldb::Format format; diff --git a/lldb/source/Commands/CommandObjectFile.cpp b/lldb/source/Commands/CommandObjectFile.cpp index 2c8d561ce6a..7d17af9f004 100644 --- a/lldb/source/Commands/CommandObjectFile.cpp +++ b/lldb/source/Commands/CommandObjectFile.cpp @@ -35,14 +35,14 @@ CommandObjectFile::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectFile::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "arch", 'a', required_argument, NULL, 0, eArgTypeArchitecture, "Specify the architecture to be used when the process is launched."}, { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition * +const OptionDefinition * CommandObjectFile::CommandOptions::GetDefinitions () { return g_option_table; diff --git a/lldb/source/Commands/CommandObjectFile.h b/lldb/source/Commands/CommandObjectFile.h index 4820b20a12b..bccb4bc2e47 100644 --- a/lldb/source/Commands/CommandObjectFile.h +++ b/lldb/source/Commands/CommandObjectFile.h @@ -55,12 +55,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp index 0bc30f43e40..8efb1649bf3 100644 --- a/lldb/source/Commands/CommandObjectFrame.cpp +++ b/lldb/source/Commands/CommandObjectFrame.cpp @@ -139,7 +139,7 @@ public: relative_frame_offset = INT32_MIN; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -147,7 +147,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; int32_t relative_frame_offset; }; @@ -271,7 +271,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectFrameSelect::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "relative", 'r', required_argument, NULL, 0, eArgTypeOffset, "A relative frame index offset from the current frame index."}, @@ -372,7 +372,7 @@ public: globals.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -380,7 +380,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; bool use_objc:1, use_regex:1, show_args:1, @@ -724,7 +724,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectFrameVariable::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "debug", 'D', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug information."}, diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp index 0092b39a816..ed196475a0b 100644 --- a/lldb/source/Commands/CommandObjectImage.cpp +++ b/lldb/source/Commands/CommandObjectImage.cpp @@ -156,7 +156,7 @@ DumpBasename (Stream &strm, const FileSpec *file_spec_ptr, uint32_t width) static void -DumpModuleSymtab (CommandInterpreter &interpreter, Stream &strm, Module *module, lldb::SortOrder sort_order) +DumpModuleSymtab (CommandInterpreter &interpreter, Stream &strm, Module *module, SortOrder sort_order) { if (module) { @@ -741,7 +741,7 @@ public: case 's': { bool found_one = false; - m_sort_order = (lldb::SortOrder) Args::StringToOptionEnum (option_arg, + m_sort_order = (SortOrder) Args::StringToOptionEnum (option_arg, g_option_table[option_idx].enum_values, eSortOrderNone, &found_one); @@ -767,14 +767,14 @@ public: m_sort_order = eSortOrderNone; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; SortOrder m_sort_order; }; @@ -784,7 +784,7 @@ protected: CommandOptions m_options; }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_sort_option_enumeration[4] = { { eSortOrderNone, "none", "No sorting, use the original symbol table order."}, @@ -794,7 +794,7 @@ g_sort_option_enumeration[4] = }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageDumpSymtab::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "sort", 's', required_argument, g_sort_option_enumeration, 0, eArgTypeSortOrder, "Supply a sort order when dumping the symbol table."}, @@ -1171,7 +1171,7 @@ public: m_format_array.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1179,7 +1179,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. typedef std::vector< std::pair<char, uint32_t> > FormatWidthCollection; @@ -1311,7 +1311,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "arch", 'a', optional_argument, NULL, 0, eArgTypeWidth, "Display the architecture when listing images."}, @@ -1441,7 +1441,7 @@ public: m_verbose = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1449,7 +1449,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; int m_type; // Should be a eLookupTypeXXX enum after parsing options std::string m_str; // Holds name lookup FileSpec m_file; // Files for file lookups @@ -1679,7 +1679,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectImageLookup::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, true, "address", 'a', required_argument, NULL, 0, eArgTypeAddress, "Lookup an address in one or more executable images."}, diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp index b887f1cc9f4..d49485a2d16 100644 --- a/lldb/source/Commands/CommandObjectLog.cpp +++ b/lldb/source/Commands/CommandObjectLog.cpp @@ -213,7 +213,7 @@ public: log_options = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -221,7 +221,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -235,7 +235,7 @@ protected: LogStreamMap m_log_streams; }; -lldb::OptionDefinition +OptionDefinition CommandObjectLogEnable::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, 0, eArgTypeFilename, "Set the destination file to log to."}, diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index 8c8b6bfebbf..4225f860b61 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -174,7 +174,7 @@ public: m_output_as_binary = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -182,7 +182,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. lldb::Format m_format; @@ -409,7 +409,7 @@ protected: #define SET1 LLDB_OPT_SET_1 #define SET2 LLDB_OPT_SET_2 -lldb::OptionDefinition +OptionDefinition CommandObjectMemoryRead::CommandOptions::g_option_table[] = { { SET1 , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat, "The format that will be used to display the memory. Defaults to bytes with ASCII (--format=Y)."}, @@ -500,7 +500,7 @@ public: m_infile_offset = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -508,7 +508,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. lldb::Format m_format; @@ -864,7 +864,7 @@ protected: #define SET1 LLDB_OPT_SET_1 #define SET2 LLDB_OPT_SET_2 -lldb::OptionDefinition +OptionDefinition CommandObjectMemoryWrite::CommandOptions::g_option_table[] = { { SET1 , false, "format", 'f', required_argument, NULL, 0, eArgTypeFormat, "The format value types that will be decoded and written to memory."}, diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index 0294d678822..0e321d035b9 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -132,7 +132,7 @@ protected: os_version_update = UINT32_MAX; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -140,7 +140,7 @@ protected: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -151,7 +151,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectPlatformCreate::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "sdk-version", 'v', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." }, diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp index ece8fe10aaf..7eb7c4a16ff 100644 --- a/lldb/source/Commands/CommandObjectProcess.cpp +++ b/lldb/source/Commands/CommandObjectProcess.cpp @@ -94,7 +94,7 @@ public: no_stdio = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -102,7 +102,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -404,7 +404,7 @@ protected: #define SET2 LLDB_OPT_SET_2 #define SET3 LLDB_OPT_SET_3 -lldb::OptionDefinition +OptionDefinition CommandObjectProcessLaunch::CommandOptions::g_option_table[] = { { SET1 | SET2 | SET3, false, "stop-at-entry", 's', no_argument, NULL, 0, eArgTypeNone, "Stop at the entry point of the program when launching a process."}, @@ -489,7 +489,7 @@ public: waitfor = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -512,7 +512,7 @@ public: // We are only completing the name option for now... - const lldb::OptionDefinition *opt_defs = GetDefinitions(); + const OptionDefinition *opt_defs = GetDefinitions(); if (opt_defs[opt_defs_index].short_option == 'n') { // Are we in the name? @@ -527,7 +527,7 @@ public: if (platform_sp) { ProcessInfoList process_infos; - platform_sp->FindProcessesByName (partial_name, partial_name ? lldb::eNameMatchStartsWith : lldb::eNameMatchIgnore, process_infos); + platform_sp->FindProcessesByName (partial_name, partial_name ? eNameMatchStartsWith : eNameMatchIgnore, process_infos); const uint32_t num_matches = process_infos.GetSize(); if (num_matches > 0) { @@ -545,7 +545,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -817,7 +817,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessAttach::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "plugin", 'P', required_argument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."}, @@ -1015,7 +1015,7 @@ public: plugin_name.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1023,7 +1023,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -1133,7 +1133,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessConnect::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "plugin", 'p', required_argument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."}, @@ -1607,7 +1607,7 @@ public: pass.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1615,7 +1615,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. @@ -1848,7 +1848,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectProcessHandle::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "stop", 's', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be stopped if the signal is received." }, diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp index 0924b9cb231..348885d4dfc 100644 --- a/lldb/source/Commands/CommandObjectSettings.cpp +++ b/lldb/source/Commands/CommandObjectSettings.cpp @@ -163,7 +163,7 @@ CommandObjectSettingsSet::Execute (Args& command, CommandReturnObject &result) { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationAssign, + eVarSetOperationAssign, m_options.m_override, m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) @@ -209,7 +209,7 @@ CommandObjectSettingsSet::HandleArgumentCompletion (Args &input, && completion_str.compare (matches.GetStringAtIndex(0)) == 0)) { matches.Clear(); - lldb::UserSettingsControllerSP root_settings = Debugger::GetSettingsController(); + UserSettingsControllerSP root_settings = Debugger::GetSettingsController(); if (cursor_index == 1) { // The user is at the end of the variable name, which is complete and valid. @@ -248,7 +248,7 @@ CommandObjectSettingsSet::CommandOptions::~CommandOptions () { } -lldb::OptionDefinition +OptionDefinition CommandObjectSettingsSet::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "no-override", 'n', no_argument, NULL, NULL, eArgTypeNone, "Prevents already existing instances and pending settings from being assigned this new value. Using this option means that only the default or specified instance setting values will be updated." }, @@ -256,7 +256,7 @@ CommandObjectSettingsSet::CommandOptions::g_option_table[] = { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL } }; -const lldb::OptionDefinition* +const OptionDefinition* CommandObjectSettingsSet::CommandOptions::GetDefinitions () { return g_option_table; @@ -341,7 +341,7 @@ CommandObjectSettingsShow::Execute (Args& command, if (command.GetArgumentCount()) { // The user requested to see the value of a particular variable. - lldb::SettableVariableType var_type; + SettableVariableType var_type; const char *variable_name = command.GetArgumentAtIndex (0); StringList value = root_settings->GetVariable (variable_name, var_type, m_interpreter.GetDebugger().GetInstanceName().AsCString(), @@ -365,16 +365,16 @@ CommandObjectSettingsShow::Execute (Args& command, if (value.GetSize() == 0) result.AppendMessageWithFormat ("%s%s = ''\n", variable_name, type_name); - else if ((var_type != lldb::eSetVarTypeArray) && (var_type != lldb::eSetVarTypeDictionary)) + else if ((var_type != eSetVarTypeArray) && (var_type != eSetVarTypeDictionary)) result.AppendMessageWithFormat ("%s%s = '%s'\n", variable_name, type_name, value.GetStringAtIndex (0)); else { result.AppendMessageWithFormat ("%s%s:\n", variable_name, type_name); for (unsigned i = 0, e = value.GetSize(); i != e; ++i) { - if (var_type == lldb::eSetVarTypeArray) + if (var_type == eSetVarTypeArray) result.AppendMessageWithFormat (" [%d]: '%s'\n", i, value.GetStringAtIndex (i)); - else if (var_type == lldb::eSetVarTypeDictionary) + else if (var_type == eSetVarTypeDictionary) result.AppendMessageWithFormat (" '%s'\n", value.GetStringAtIndex (i)); } } @@ -615,7 +615,7 @@ CommandObjectSettingsRemove::Execute ( Args& command, Error err = root_settings->SetVariable (var_name_string.c_str(), NULL, - lldb::eVarSetOperationRemove, + eVarSetOperationRemove, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -765,7 +765,7 @@ CommandObjectSettingsReplace::Execute ( Args& command, { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationReplace, + eVarSetOperationReplace, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -911,7 +911,7 @@ CommandObjectSettingsInsertBefore::Execute ( Args& { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationInsertBefore, + eVarSetOperationInsertBefore, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -1058,7 +1058,7 @@ CommandObjectSettingsInsertAfter::Execute ( Args& co { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationInsertAfter, + eVarSetOperationInsertAfter, true, m_interpreter.GetDebugger().GetInstanceName().AsCString(), index_value_string.c_str()); @@ -1183,7 +1183,7 @@ CommandObjectSettingsAppend::Execute (Args& command, { Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, - lldb::eVarSetOperationAppend, + eVarSetOperationAppend, true, m_interpreter.GetDebugger().GetInstanceName().AsCString()); if (err.Fail ()) @@ -1279,7 +1279,7 @@ CommandObjectSettingsClear::Execute ( Args& command, Error err = root_settings->SetVariable (var_name, NULL, - lldb::eVarSetOperationClear, + eVarSetOperationClear, false, m_interpreter.GetDebugger().GetInstanceName().AsCString()); diff --git a/lldb/source/Commands/CommandObjectSettings.h b/lldb/source/Commands/CommandObjectSettings.h index 9f369642b51..7d78c08f65d 100644 --- a/lldb/source/Commands/CommandObjectSettings.h +++ b/lldb/source/Commands/CommandObjectSettings.h @@ -70,12 +70,12 @@ public: void ResetOptionValues (); - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions (); // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. diff --git a/lldb/source/Commands/CommandObjectSource.cpp b/lldb/source/Commands/CommandObjectSource.cpp index bc9fc371f59..2c7fb33a763 100644 --- a/lldb/source/Commands/CommandObjectSource.cpp +++ b/lldb/source/Commands/CommandObjectSource.cpp @@ -81,12 +81,12 @@ class CommandObjectSourceInfo : public CommandObject start_line = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. FileSpec file_spec; @@ -131,7 +131,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectSourceInfo::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "line", 'l', required_argument, NULL, 0, eArgTypeLineNum, "The line number at which to start the display source."}, @@ -210,12 +210,12 @@ class CommandObjectSourceList : public CommandObject m_modules.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. FileSpec file_spec; @@ -568,7 +568,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectSourceList::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "The number of source lines to display."}, diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index f6c7a1cfa57..1780f2b4a5c 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -501,7 +501,7 @@ public: ~CommandOptions () {} - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -606,7 +606,7 @@ public: } - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; std::string m_class_name; std::string m_function_name; @@ -824,7 +824,7 @@ private: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectTargetStopHookAdd::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 487cfc96b56..977f63fee35 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -305,7 +305,7 @@ public: m_start = 0; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -313,7 +313,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. uint32_t m_count; @@ -466,7 +466,7 @@ protected: CommandOptions m_options; }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadBacktrace::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "How many frames to display (-1 for all)"}, @@ -551,7 +551,7 @@ public: m_avoid_regexp.clear(); } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -559,7 +559,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. bool m_avoid_no_debug; @@ -775,7 +775,7 @@ protected: CommandOptions m_options; }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_tri_running_mode[] = { { eOnlyThisThread, "this-thread", "Run only this thread"}, @@ -784,7 +784,7 @@ g_tri_running_mode[] = { 0, NULL, NULL } }; -static lldb::OptionEnumValueElement +static OptionEnumValueElement g_duo_running_mode[] = { { eOnlyThisThread, "this-thread", "Run only this thread"}, @@ -792,7 +792,7 @@ g_duo_running_mode[] = { 0, NULL, NULL } }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadStepWithTypeAndScope::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "avoid-no-debug", 'a', required_argument, NULL, 0, eArgTypeBoolean, "A boolean value that sets whether step-in will step over functions with no debug information."}, @@ -1050,7 +1050,7 @@ public: m_stop_others = false; } - const lldb::OptionDefinition* + const OptionDefinition* GetDefinitions () { return g_option_table; @@ -1061,7 +1061,7 @@ public: // Options table: Required for subclasses of Options. - static lldb::OptionDefinition g_option_table[]; + static OptionDefinition g_option_table[]; // Instance variables to hold the values for command options. }; @@ -1259,7 +1259,7 @@ protected: }; -lldb::OptionDefinition +OptionDefinition CommandObjectThreadUntil::CommandOptions::g_option_table[] = { { LLDB_OPT_SET_1, false, "frame", 'f', required_argument, NULL, 0, eArgTypeFrameIndex, "Frame index for until operation - defaults to 0"}, |
