[Lldb-commits] [lldb] 2d704f4 - Start to clean up the process of defining command arguments. (#83097)
via lldb-commits
lldb-commits at lists.llvm.org
Tue Feb 27 10:34:05 PST 2024
Author: jimingham
Date: 2024-02-27T10:34:01-08:00
New Revision: 2d704f4bf2edb0f9343dac818ab4d29442be9968
URL: https://github.com/llvm/llvm-project/commit/2d704f4bf2edb0f9343dac818ab4d29442be9968
DIFF: https://github.com/llvm/llvm-project/commit/2d704f4bf2edb0f9343dac818ab4d29442be9968.diff
LOG: Start to clean up the process of defining command arguments. (#83097)
Partly, there's just a lot of unnecessary boiler plate. It's also
possible to define combinations of arguments that make no sense (e.g.
eArgRepeatPlus followed by eArgRepeatPlain...) but these are never
checked since we just push_back directly into the argument definitions.
This commit is step 1 of this cleanup - do the obvious stuff. In it, all
the simple homogenous argument lists and the breakpoint/watchpoint
ID/Range types, are set with common functions. This is an NFC change, it
just centralizes boiler plate. There's no checking yet because you can't
get a single argument wrong.
The end goal is that all argument definition goes through functions and
m_arguments is hidden so that you can't define inconsistent argument
sets.
Added:
Modified:
lldb/include/lldb/Interpreter/CommandObject.h
lldb/source/Commands/CommandObjectApropos.cpp
lldb/source/Commands/CommandObjectBreakpoint.cpp
lldb/source/Commands/CommandObjectBreakpointCommand.cpp
lldb/source/Commands/CommandObjectCommands.cpp
lldb/source/Commands/CommandObjectDWIMPrint.cpp
lldb/source/Commands/CommandObjectExpression.cpp
lldb/source/Commands/CommandObjectFrame.cpp
lldb/source/Commands/CommandObjectHelp.cpp
lldb/source/Commands/CommandObjectLog.cpp
lldb/source/Commands/CommandObjectPlatform.cpp
lldb/source/Commands/CommandObjectPlugin.cpp
lldb/source/Commands/CommandObjectProcess.cpp
lldb/source/Commands/CommandObjectQuit.cpp
lldb/source/Commands/CommandObjectRegister.cpp
lldb/source/Commands/CommandObjectSession.cpp
lldb/source/Commands/CommandObjectSettings.cpp
lldb/source/Commands/CommandObjectTarget.cpp
lldb/source/Commands/CommandObjectThread.cpp
lldb/source/Commands/CommandObjectThreadUtil.cpp
lldb/source/Commands/CommandObjectTrace.cpp
lldb/source/Commands/CommandObjectType.cpp
lldb/source/Commands/CommandObjectWatchpoint.cpp
lldb/source/Commands/CommandObjectWatchpointCommand.cpp
lldb/source/Interpreter/CommandObject.cpp
lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
Removed:
################################################################################
diff --git a/lldb/include/lldb/Interpreter/CommandObject.h b/lldb/include/lldb/Interpreter/CommandObject.h
index a326c6dc38a37a..a641a468b49d20 100644
--- a/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/lldb/include/lldb/Interpreter/CommandObject.h
@@ -207,6 +207,20 @@ class CommandObject : public std::enable_shared_from_this<CommandObject> {
static const ArgumentTableEntry *
FindArgumentDataByType(lldb::CommandArgumentType arg_type);
+ // Sets the argument list for this command to one homogenous argument type,
+ // with the repeat specified.
+ void AddSimpleArgumentList(
+ lldb::CommandArgumentType arg_type,
+ ArgumentRepetitionType repetition_type = eArgRepeatPlain);
+
+ // Helper function to set BP IDs or ID ranges as the command argument data
+ // for this command.
+ // This used to just populate an entry you could add to, but that was never
+ // used. If we ever need that we can take optional extra args here.
+ // Use this to define a simple argument list:
+ enum IDType { eBreakpointArgs = 0, eWatchpointArgs = 1 };
+ void AddIDsArgumentData(IDType type);
+
int GetNumArgumentEntries();
CommandArgumentEntry *GetArgumentEntryAtIndex(int idx);
@@ -391,12 +405,6 @@ class CommandObject : public std::enable_shared_from_this<CommandObject> {
lldb_private::CommandOverrideCallbackWithResult m_command_override_callback;
void *m_command_override_baton;
bool m_is_user_command = false;
-
- // Helper function to populate IDs or ID ranges as the command argument data
- // to the specified command argument entry.
- static void AddIDsArgumentData(CommandArgumentEntry &arg,
- lldb::CommandArgumentType ID,
- lldb::CommandArgumentType IDRange);
};
class CommandObjectParsed : public CommandObject {
diff --git a/lldb/source/Commands/CommandObjectApropos.cpp b/lldb/source/Commands/CommandObjectApropos.cpp
index 88c214d4fc56ab..d663f2bd923fe2 100644
--- a/lldb/source/Commands/CommandObjectApropos.cpp
+++ b/lldb/source/Commands/CommandObjectApropos.cpp
@@ -21,19 +21,7 @@ CommandObjectApropos::CommandObjectApropos(CommandInterpreter &interpreter)
: CommandObjectParsed(
interpreter, "apropos",
"List debugger commands related to a word or subject.", nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData search_word_arg;
-
- // Define the first (and only) variant of this arg.
- search_word_arg.arg_type = eArgTypeSearchWord;
- search_word_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the argument
- // entry.
- arg.push_back(search_word_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeSearchWord);
}
CommandObjectApropos::~CommandObjectApropos() = default;
diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp
index cfb0b87a59e640..fbece865f11314 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -813,12 +813,7 @@ class CommandObjectBreakpointModify : public CommandObjectParsed {
"With the exception of -e, -d and -i, passing an "
"empty argument clears the modification.",
nullptr) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeBreakpointID,
- eArgTypeBreakpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eBreakpointArgs);
m_options.Append(&m_bp_opts,
LLDB_OPT_SET_1 | LLDB_OPT_SET_2 | LLDB_OPT_SET_3,
@@ -890,12 +885,7 @@ class CommandObjectBreakpointEnable : public CommandObjectParsed {
"Enable the specified disabled breakpoint(s). If "
"no breakpoints are specified, enable all of them.",
nullptr) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeBreakpointID,
- eArgTypeBreakpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eBreakpointArgs);
}
~CommandObjectBreakpointEnable() override = default;
@@ -1002,12 +992,7 @@ execution will NOT stop at location 1.1. To achieve that, type:
"The first command disables all locations for breakpoint 1, \
the second re-enables the first location.");
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeBreakpointID,
- eArgTypeBreakpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eBreakpointArgs);
}
~CommandObjectBreakpointDisable() override = default;
@@ -1098,15 +1083,7 @@ class CommandObjectBreakpointList : public CommandObjectParsed {
CommandArgumentData bp_id_arg;
// Define the first (and only) variant of this arg.
- bp_id_arg.arg_type = eArgTypeBreakpointID;
- bp_id_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(bp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeBreakpointID, eArgRepeatOptional);
}
~CommandObjectBreakpointList() override = default;
@@ -1372,12 +1349,7 @@ class CommandObjectBreakpointDelete : public CommandObjectParsed {
"Delete the specified breakpoint(s). If no "
"breakpoints are specified, delete them all.",
nullptr) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeBreakpointID,
- eArgTypeBreakpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eBreakpointArgs);
}
~CommandObjectBreakpointDelete() override = default;
@@ -1677,14 +1649,7 @@ class CommandObjectBreakpointNameConfigure : public CommandObjectParsed {
"on the name.",
"breakpoint name configure <command-options> "
"<breakpoint-name-list>") {
- // Create the first variant for the first (and only) argument for this
- // command.
- CommandArgumentEntry arg1;
- CommandArgumentData id_arg;
- id_arg.arg_type = eArgTypeBreakpointName;
- id_arg.arg_repetition = eArgRepeatOptional;
- arg1.push_back(id_arg);
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeBreakpointName, eArgRepeatOptional);
m_option_group.Append(&m_bp_opts, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Append(&m_access_options, LLDB_OPT_SET_ALL,
@@ -1770,14 +1735,7 @@ class CommandObjectBreakpointNameAdd : public CommandObjectParsed {
: CommandObjectParsed(
interpreter, "add", "Add a name to the breakpoints provided.",
"breakpoint name add <command-options> <breakpoint-id-list>") {
- // Create the first variant for the first (and only) argument for this
- // command.
- CommandArgumentEntry arg1;
- CommandArgumentData id_arg;
- id_arg.arg_type = eArgTypeBreakpointID;
- id_arg.arg_repetition = eArgRepeatOptional;
- arg1.push_back(id_arg);
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeBreakpointID, eArgRepeatOptional);
m_option_group.Append(&m_name_options, LLDB_OPT_SET_1, LLDB_OPT_SET_ALL);
m_option_group.Finalize();
@@ -1851,14 +1809,7 @@ class CommandObjectBreakpointNameDelete : public CommandObjectParsed {
interpreter, "delete",
"Delete a name from the breakpoints provided.",
"breakpoint name delete <command-options> <breakpoint-id-list>") {
- // Create the first variant for the first (and only) argument for this
- // command.
- CommandArgumentEntry arg1;
- CommandArgumentData id_arg;
- id_arg.arg_type = eArgTypeBreakpointID;
- id_arg.arg_repetition = eArgRepeatOptional;
- arg1.push_back(id_arg);
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeBreakpointID, eArgRepeatOptional);
m_option_group.Append(&m_name_options, LLDB_OPT_SET_1, LLDB_OPT_SET_ALL);
m_option_group.Finalize();
@@ -2308,12 +2259,7 @@ class CommandObjectBreakpointWrite : public CommandObjectParsed {
"be read in with \"breakpoint read\". "
"If given no arguments, writes all breakpoints.",
nullptr) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeBreakpointID,
- eArgTypeBreakpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eBreakpointArgs);
}
~CommandObjectBreakpointWrite() override = default;
diff --git a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
index fefafcd94546a5..6ebe6e8a35570e 100644
--- a/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
@@ -185,19 +185,7 @@ are no syntax errors may indicate that a function was declared but never called.
LLDB_OPT_SET_2);
m_all_options.Finalize();
- CommandArgumentEntry arg;
- CommandArgumentData bp_id_arg;
-
- // Define the first (and only) variant of this arg.
- bp_id_arg.arg_type = eArgTypeBreakpointID;
- bp_id_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(bp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeBreakpointID, eArgRepeatOptional);
}
~CommandObjectBreakpointCommandAdd() override = default;
@@ -449,19 +437,7 @@ class CommandObjectBreakpointCommandDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "delete",
"Delete the set of commands from a breakpoint.",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData bp_id_arg;
-
- // Define the first (and only) variant of this arg.
- bp_id_arg.arg_type = eArgTypeBreakpointID;
- bp_id_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(bp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeBreakpointID);
}
~CommandObjectBreakpointCommandDelete() override = default;
@@ -565,19 +541,7 @@ class CommandObjectBreakpointCommandList : public CommandObjectParsed {
"List the script or set of commands to be "
"executed when the breakpoint is hit.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandArgumentData bp_id_arg;
-
- // Define the first (and only) variant of this arg.
- bp_id_arg.arg_type = eArgTypeBreakpointID;
- bp_id_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(bp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeBreakpointID);
}
~CommandObjectBreakpointCommandList() override = default;
diff --git a/lldb/source/Commands/CommandObjectCommands.cpp b/lldb/source/Commands/CommandObjectCommands.cpp
index 7c459bdaf38022..f4903e373b086b 100644
--- a/lldb/source/Commands/CommandObjectCommands.cpp
+++ b/lldb/source/Commands/CommandObjectCommands.cpp
@@ -41,19 +41,7 @@ class CommandObjectCommandsSource : public CommandObjectParsed {
interpreter, "command source",
"Read and execute LLDB commands from the file <filename>.",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData file_arg;
-
- // Define the first (and only) variant of this arg.
- file_arg.arg_type = eArgTypeFilename;
- file_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(file_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFilename);
}
~CommandObjectCommandsSource() override = default;
@@ -614,19 +602,7 @@ class CommandObjectCommandsUnalias : public CommandObjectParsed {
interpreter, "command unalias",
"Delete one or more custom commands defined by 'command alias'.",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData alias_arg;
-
- // Define the first (and only) variant of this arg.
- alias_arg.arg_type = eArgTypeAliasName;
- alias_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(alias_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeAliasName);
}
~CommandObjectCommandsUnalias() override = default;
@@ -701,19 +677,7 @@ class CommandObjectCommandsDelete : public CommandObjectParsed {
interpreter, "command delete",
"Delete one or more custom commands defined by 'command regex'.",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData alias_arg;
-
- // Define the first (and only) variant of this arg.
- alias_arg.arg_type = eArgTypeCommandName;
- alias_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(alias_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeCommandName);
}
~CommandObjectCommandsDelete() override = default;
@@ -815,8 +779,7 @@ a number follows 'f':"
R"(
(lldb) command regex f s/^$/finish/ 's/([0-9]+)/frame select %1/')");
- CommandArgumentData thread_arg{eArgTypeSEDStylePair, eArgRepeatOptional};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeSEDStylePair, eArgRepeatOptional);
}
~CommandObjectCommandsAddRegex() override = default;
@@ -1944,19 +1907,7 @@ class CommandObjectCommandsScriptImport : public CommandObjectParsed {
CommandObjectCommandsScriptImport(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "command script import",
"Import a scripting module in LLDB.", nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // Define the first (and only) variant of this arg.
- cmd_arg.arg_type = eArgTypeFilename;
- cmd_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeFilename, eArgRepeatPlus);
}
~CommandObjectCommandsScriptImport() override = default;
@@ -2066,20 +2017,7 @@ class CommandObjectCommandsScriptAdd : public CommandObjectParsed,
"command, and the last element will be the new "
"command name."),
IOHandlerDelegateMultiline("DONE") {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // This is one or more command names, which form the path to the command
- // you want to add.
- cmd_arg.arg_type = eArgTypeCommand;
- cmd_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeCommand, eArgRepeatPlus);
}
~CommandObjectCommandsScriptAdd() override = default;
@@ -2400,20 +2338,7 @@ class CommandObjectCommandsScriptDelete : public CommandObjectParsed {
interpreter, "command script delete",
"Delete a scripted command by specifying the path to the command.",
nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // This is a list of command names forming the path to the command
- // to be deleted.
- cmd_arg.arg_type = eArgTypeCommand;
- cmd_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeCommand, eArgRepeatPlus);
}
~CommandObjectCommandsScriptDelete() override = default;
@@ -2549,20 +2474,7 @@ class CommandObjectCommandsContainerAdd : public CommandObjectParsed {
"Add a container command to lldb. Adding to built-"
"in container commands is not allowed.",
"command container add [[path1]...] container-name") {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // This is one or more command names, which form the path to the command
- // you want to add.
- cmd_arg.arg_type = eArgTypeCommand;
- cmd_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeCommand, eArgRepeatPlus);
}
~CommandObjectCommandsContainerAdd() override = default;
@@ -2690,20 +2602,7 @@ class CommandObjectCommandsContainerDelete : public CommandObjectParsed {
"Delete a container command previously added to "
"lldb.",
"command container delete [[path1] ...] container-cmd") {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // This is one or more command names, which form the path to the command
- // you want to add.
- cmd_arg.arg_type = eArgTypeCommand;
- cmd_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeCommand, eArgRepeatPlus);
}
~CommandObjectCommandsContainerDelete() override = default;
diff --git a/lldb/source/Commands/CommandObjectDWIMPrint.cpp b/lldb/source/Commands/CommandObjectDWIMPrint.cpp
index fb2cc106ffd2dd..b183cb423111fb 100644
--- a/lldb/source/Commands/CommandObjectDWIMPrint.cpp
+++ b/lldb/source/Commands/CommandObjectDWIMPrint.cpp
@@ -37,8 +37,7 @@ CommandObjectDWIMPrint::CommandObjectDWIMPrint(CommandInterpreter &interpreter)
"dwim-print [<variable-name> | <expression>]",
eCommandProcessMustBePaused | eCommandTryTargetAPILock) {
- CommandArgumentData var_name_arg(eArgTypeVarName, eArgRepeatPlain);
- m_arguments.push_back({var_name_arg});
+ AddSimpleArgumentList(eArgTypeVarName);
m_option_group.Append(&m_format_options,
OptionGroupFormat::OPTION_GROUP_FORMAT |
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index 3a2dc11e1e71cc..2319ddd3c80af0 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -311,19 +311,7 @@ format."
expr unsigned int $foo = 5
expr char c[] = \"foo\"; c[0])");
- CommandArgumentEntry arg;
- CommandArgumentData expression_arg;
-
- // Define the first (and only) variant of this arg.
- expression_arg.arg_type = eArgTypeExpression;
- expression_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the argument
- // entry.
- arg.push_back(expression_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeExpression);
// Add the "--format" and "--gdb-format"
m_option_group.Append(&m_format_options,
diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp
index f092d54ffe9932..b1d060b3c6cf2f 100644
--- a/lldb/source/Commands/CommandObjectFrame.cpp
+++ b/lldb/source/Commands/CommandObjectFrame.cpp
@@ -113,19 +113,7 @@ class CommandObjectFrameDiagnose : public CommandObjectParsed {
eCommandRequiresThread | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeFrameIndex;
- index_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFrameIndex, eArgRepeatOptional);
}
~CommandObjectFrameDiagnose() override = default;
@@ -269,19 +257,7 @@ class CommandObjectFrameSelect : public CommandObjectParsed {
eCommandRequiresThread | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeFrameIndex;
- index_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFrameIndex, eArgRepeatOptional);
}
~CommandObjectFrameSelect() override = default;
@@ -409,19 +385,7 @@ However, 'frame variable' is more efficient, since it uses debug information and
memory reads directly, rather than parsing and evaluating an expression, which
may even involve JITing and running code in the target program.)");
- CommandArgumentEntry arg;
- CommandArgumentData var_name_arg;
-
- // Define the first (and only) variant of this arg.
- var_name_arg.arg_type = eArgTypeVarName;
- var_name_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(var_name_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeVarName, eArgRepeatStar);
m_option_group.Append(&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Append(&m_option_format,
@@ -939,8 +903,7 @@ class CommandObjectFrameRecognizerDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "frame recognizer delete",
"Delete an existing frame recognizer by id.",
nullptr) {
- CommandArgumentData thread_arg{eArgTypeRecognizerID, eArgRepeatPlain};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeRecognizerID);
}
~CommandObjectFrameRecognizerDelete() override = default;
@@ -1065,19 +1028,7 @@ class CommandObjectFrameRecognizerInfo : public CommandObjectParsed {
interpreter, "frame recognizer info",
"Show which frame recognizer is applied a stack frame (if any).",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeFrameIndex;
- index_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFrameIndex);
}
~CommandObjectFrameRecognizerInfo() override = default;
diff --git a/lldb/source/Commands/CommandObjectHelp.cpp b/lldb/source/Commands/CommandObjectHelp.cpp
index ddb006e52d2c54..f1dbd03fe97cbd 100644
--- a/lldb/source/Commands/CommandObjectHelp.cpp
+++ b/lldb/source/Commands/CommandObjectHelp.cpp
@@ -48,20 +48,9 @@ CommandObjectHelp::CommandObjectHelp(CommandInterpreter &interpreter)
"commands, or give details "
"about a specific command.",
"help [<cmd-name>]") {
- CommandArgumentEntry arg;
- CommandArgumentData command_arg;
-
// A list of command names forming a path to the command we want help on.
// No names is allowed - in which case we dump the top-level help.
- command_arg.arg_type = eArgTypeCommand;
- command_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the argument
- // entry.
- arg.push_back(command_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeCommand, eArgRepeatStar);
}
CommandObjectHelp::~CommandObjectHelp() = default;
diff --git a/lldb/source/Commands/CommandObjectLog.cpp b/lldb/source/Commands/CommandObjectLog.cpp
index 6bfbf98078e6e8..48dfd9456a6608 100644
--- a/lldb/source/Commands/CommandObjectLog.cpp
+++ b/lldb/source/Commands/CommandObjectLog.cpp
@@ -288,19 +288,7 @@ class CommandObjectLogList : public CommandObjectParsed {
"List the log categories for one or more log "
"channels. If none specified, lists them all.",
nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData channel_arg;
-
- // Define the first (and only) variant of this arg.
- channel_arg.arg_type = eArgTypeLogChannel;
- channel_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(channel_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeLogChannel, eArgRepeatStar);
}
~CommandObjectLogList() override = default;
@@ -335,19 +323,7 @@ class CommandObjectLogDump : public CommandObjectParsed {
CommandObjectLogDump(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "log dump",
"dump circular buffer logs", nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData channel_arg;
-
- // Define the first (and only) variant of this arg.
- channel_arg.arg_type = eArgTypeLogChannel;
- channel_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(channel_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeLogChannel);
}
~CommandObjectLogDump() override = default;
@@ -444,19 +420,7 @@ class CommandObjectLogTimerEnable : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "log timers enable",
"enable LLDB internal performance timers",
"log timers enable <depth>") {
- CommandArgumentEntry arg;
- CommandArgumentData depth_arg;
-
- // Define the first (and only) variant of this arg.
- depth_arg.arg_type = eArgTypeCount;
- depth_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(depth_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeCount, eArgRepeatOptional);
}
~CommandObjectLogTimerEnable() override = default;
@@ -559,19 +523,7 @@ class CommandObjectLogTimerIncrement : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "log timers increment",
"increment LLDB internal performance timers",
"log timers increment <bool>") {
- CommandArgumentEntry arg;
- CommandArgumentData bool_arg;
-
- // Define the first (and only) variant of this arg.
- bool_arg.arg_type = eArgTypeBoolean;
- bool_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(bool_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeBoolean);
}
~CommandObjectLogTimerIncrement() override = default;
diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp
index b25c391bd4faa2..5b18f2b60e92dd 100644
--- a/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -155,8 +155,7 @@ class CommandObjectPlatformSelect : public CommandObjectParsed {
{
m_option_group.Append(&m_platform_options, LLDB_OPT_SET_ALL, 1);
m_option_group.Finalize();
- CommandArgumentData platform_arg{eArgTypePlatform, eArgRepeatPlain};
- m_arguments.push_back({platform_arg});
+ AddSimpleArgumentList(eArgTypePlatform);
}
~CommandObjectPlatformSelect() override = default;
@@ -276,8 +275,7 @@ class CommandObjectPlatformConnect : public CommandObjectParsed {
interpreter, "platform connect",
"Select the current platform by providing a connection URL.",
"platform connect <connect-url>", 0) {
- CommandArgumentData platform_arg{eArgTypeConnectURL, eArgRepeatPlain};
- m_arguments.push_back({platform_arg});
+ AddSimpleArgumentList(eArgTypeConnectURL);
}
~CommandObjectPlatformConnect() override = default;
@@ -418,8 +416,7 @@ class CommandObjectPlatformMkDir : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "platform mkdir",
"Make a new directory on the remote end.", nullptr,
0) {
- CommandArgumentData thread_arg{eArgTypeRemotePath, eArgRepeatPlain};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeRemotePath);
}
~CommandObjectPlatformMkDir() override = default;
@@ -467,8 +464,7 @@ class CommandObjectPlatformFOpen : public CommandObjectParsed {
CommandObjectPlatformFOpen(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "platform file open",
"Open a file on the remote end.", nullptr, 0) {
- CommandArgumentData path_arg{eArgTypeRemotePath, eArgRepeatPlain};
- m_arguments.push_back({path_arg});
+ AddSimpleArgumentList(eArgTypeRemotePath);
}
~CommandObjectPlatformFOpen() override = default;
@@ -521,8 +517,7 @@ class CommandObjectPlatformFClose : public CommandObjectParsed {
CommandObjectPlatformFClose(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "platform file close",
"Close a file on the remote end.", nullptr, 0) {
- CommandArgumentData path_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({path_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectPlatformFClose() override = default;
@@ -564,8 +559,7 @@ class CommandObjectPlatformFRead : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "platform file read",
"Read data from a file on the remote end.", nullptr,
0) {
- CommandArgumentData path_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({path_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectPlatformFRead() override = default;
@@ -659,8 +653,7 @@ class CommandObjectPlatformFWrite : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "platform file write",
"Write data to a file on the remote end.", nullptr,
0) {
- CommandArgumentData path_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({path_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectPlatformFWrite() override = default;
@@ -863,18 +856,7 @@ class CommandObjectPlatformGetSize : public CommandObjectParsed {
Get the file size from the remote end with path /the/remote/file/path.)");
- CommandArgumentEntry arg1;
- CommandArgumentData file_arg_remote;
-
- // Define the first (and only) variant of this arg.
- file_arg_remote.arg_type = eArgTypeRemoteFilename;
- file_arg_remote.arg_repetition = eArgRepeatPlain;
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(file_arg_remote);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeRemoteFilename);
}
~CommandObjectPlatformGetSize() override = default;
@@ -922,18 +904,7 @@ class CommandObjectPlatformGetPermissions : public CommandObjectParsed {
Get the file permissions from the remote end with path /the/remote/file/path.)");
- CommandArgumentEntry arg1;
- CommandArgumentData file_arg_remote;
-
- // Define the first (and only) variant of this arg.
- file_arg_remote.arg_type = eArgTypeRemoteFilename;
- file_arg_remote.arg_repetition = eArgRepeatPlain;
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(file_arg_remote);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeRemoteFilename);
}
~CommandObjectPlatformGetPermissions() override = default;
@@ -980,18 +951,7 @@ class CommandObjectPlatformFileExists : public CommandObjectParsed {
Check if /the/remote/file/path exists on the remote end.)");
- CommandArgumentEntry arg1;
- CommandArgumentData file_arg_remote;
-
- // Define the first (and only) variant of this arg.
- file_arg_remote.arg_type = eArgTypeRemoteFilename;
- file_arg_remote.arg_repetition = eArgRepeatPlain;
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(file_arg_remote);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeRemoteFilename);
}
~CommandObjectPlatformFileExists() override = default;
@@ -1093,8 +1053,7 @@ class CommandObjectPlatformProcessLaunch : public CommandObjectParsed {
m_all_options.Append(&m_class_options, LLDB_OPT_SET_1 | LLDB_OPT_SET_2,
LLDB_OPT_SET_ALL);
m_all_options.Finalize();
- CommandArgumentData run_arg_arg{eArgTypeRunArgs, eArgRepeatStar};
- m_arguments.push_back({run_arg_arg});
+ AddSimpleArgumentList(eArgTypeRunArgs, eArgRepeatStar);
}
void
@@ -1503,19 +1462,7 @@ class CommandObjectPlatformProcessInfo : public CommandObjectParsed {
interpreter, "platform process info",
"Get detailed information for one or more process by process ID.",
"platform process info <pid> [<pid> <pid> ...]", 0) {
- CommandArgumentEntry arg;
- CommandArgumentData pid_args;
-
- // Define the first (and only) variant of this arg.
- pid_args.arg_type = eArgTypePid;
- pid_args.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(pid_args);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypePid, eArgRepeatStar);
}
~CommandObjectPlatformProcessInfo() override = default;
@@ -1721,8 +1668,7 @@ class CommandObjectPlatformShell : public CommandObjectRaw {
: CommandObjectRaw(interpreter, "platform shell",
"Run a shell command on the current platform.",
"platform shell <shell-command>", 0) {
- CommandArgumentData thread_arg{eArgTypeNone, eArgRepeatStar};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeNone, eArgRepeatStar);
}
~CommandObjectPlatformShell() override = default;
diff --git a/lldb/source/Commands/CommandObjectPlugin.cpp b/lldb/source/Commands/CommandObjectPlugin.cpp
index da3b5f0518a690..f3108b8a768d2a 100644
--- a/lldb/source/Commands/CommandObjectPlugin.cpp
+++ b/lldb/source/Commands/CommandObjectPlugin.cpp
@@ -19,19 +19,7 @@ class CommandObjectPluginLoad : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "plugin load",
"Import a dylib that implements an LLDB plugin.",
nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData cmd_arg;
-
- // Define the first (and only) variant of this arg.
- cmd_arg.arg_type = eArgTypeFilename;
- cmd_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(cmd_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeFilename);
}
~CommandObjectPluginLoad() override = default;
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 7cd5ad656f1b05..9ac97eb66b6232 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -126,19 +126,7 @@ class CommandObjectProcessLaunch : public CommandObjectProcessLaunchOrAttach {
LLDB_OPT_SET_ALL);
m_all_options.Finalize();
- CommandArgumentEntry arg;
- CommandArgumentData run_args_arg;
-
- // Define the first (and only) variant of this arg.
- run_args_arg.arg_type = eArgTypeRunArgs;
- run_args_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(run_args_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeRunArgs, eArgRepeatOptional);
}
~CommandObjectProcessLaunch() override = default;
@@ -870,8 +858,7 @@ class CommandObjectProcessConnect : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "process connect",
"Connect to a remote debug service.",
"process connect <remote-url>", 0) {
- CommandArgumentData connect_arg{eArgTypeConnectURL, eArgRepeatPlain};
- m_arguments.push_back({connect_arg});
+ AddSimpleArgumentList(eArgTypeConnectURL);
}
~CommandObjectProcessConnect() override = default;
@@ -996,8 +983,7 @@ class CommandObjectProcessLoad : public CommandObjectParsed {
eCommandRequiresProcess | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentData file_arg{eArgTypePath, eArgRepeatPlus};
- m_arguments.push_back({file_arg});
+ AddSimpleArgumentList(eArgTypePath, eArgRepeatPlus);
}
~CommandObjectProcessLoad() override = default;
@@ -1070,8 +1056,7 @@ class CommandObjectProcessUnload : public CommandObjectParsed {
"process unload <index>",
eCommandRequiresProcess | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched | eCommandProcessMustBePaused) {
- CommandArgumentData load_idx_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({load_idx_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectProcessUnload() override = default;
@@ -1131,19 +1116,7 @@ class CommandObjectProcessSignal : public CommandObjectParsed {
interpreter, "process signal",
"Send a UNIX signal to the current target process.", nullptr,
eCommandRequiresProcess | eCommandTryTargetAPILock) {
- CommandArgumentEntry arg;
- CommandArgumentData signal_arg;
-
- // Define the first (and only) variant of this arg.
- signal_arg.arg_type = eArgTypeUnixSignal;
- signal_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(signal_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeUnixSignal);
}
~CommandObjectProcessSignal() override = default;
@@ -1274,8 +1247,7 @@ class CommandObjectProcessSaveCore : public CommandObjectParsed {
"process save-core [-s corefile-style -p plugin-name] FILE",
eCommandRequiresProcess | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched) {
- CommandArgumentData file_arg{eArgTypePath, eArgRepeatPlain};
- m_arguments.push_back({file_arg});
+ AddSimpleArgumentList(eArgTypePath);
}
~CommandObjectProcessSaveCore() override = default;
@@ -1559,15 +1531,7 @@ class CommandObjectProcessHandle : public CommandObjectParsed {
"by passing the -t option."
"\nYou can also clear the target modification for a signal"
"by passing the -c option");
- CommandArgumentEntry arg;
- CommandArgumentData signal_arg;
-
- signal_arg.arg_type = eArgTypeUnixSignal;
- signal_arg.arg_repetition = eArgRepeatStar;
-
- arg.push_back(signal_arg);
-
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeUnixSignal, eArgRepeatStar);
}
~CommandObjectProcessHandle() override = default;
diff --git a/lldb/source/Commands/CommandObjectQuit.cpp b/lldb/source/Commands/CommandObjectQuit.cpp
index d7caf1546fb574..8e7830b2afc638 100644
--- a/lldb/source/Commands/CommandObjectQuit.cpp
+++ b/lldb/source/Commands/CommandObjectQuit.cpp
@@ -21,8 +21,7 @@ using namespace lldb_private;
CommandObjectQuit::CommandObjectQuit(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "quit", "Quit the LLDB debugger.",
"quit [exit-code]") {
- CommandArgumentData exit_code_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({exit_code_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
CommandObjectQuit::~CommandObjectQuit() = default;
diff --git a/lldb/source/Commands/CommandObjectRegister.cpp b/lldb/source/Commands/CommandObjectRegister.cpp
index 4ffdde1ee09f9f..4e047ccbc10b92 100644
--- a/lldb/source/Commands/CommandObjectRegister.cpp
+++ b/lldb/source/Commands/CommandObjectRegister.cpp
@@ -50,19 +50,7 @@ class CommandObjectRegisterRead : public CommandObjectParsed {
{{CommandArgumentType::eArgTypeFormat,
"Specify a format to be used for display. If this "
"is set, register fields will not be displayed."}}) {
- CommandArgumentEntry arg;
- CommandArgumentData register_arg;
-
- // Define the first (and only) variant of this arg.
- register_arg.arg_type = eArgTypeRegisterName;
- register_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(register_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeRegisterName, eArgRepeatStar);
// Add the "--format"
m_option_group.Append(&m_format_options,
@@ -422,13 +410,7 @@ Fields (*) A table of the names and bit positions of the values contained
Fields marked with (*) may not always be present. Some information may be
diff erent for the same register when connected to
diff erent debug servers.)");
- CommandArgumentData register_arg;
- register_arg.arg_type = eArgTypeRegisterName;
- register_arg.arg_repetition = eArgRepeatPlain;
-
- CommandArgumentEntry arg1;
- arg1.push_back(register_arg);
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeRegisterName);
}
~CommandObjectRegisterInfo() override = default;
diff --git a/lldb/source/Commands/CommandObjectSession.cpp b/lldb/source/Commands/CommandObjectSession.cpp
index 28506d6c59512d..c381ba4f74f120 100644
--- a/lldb/source/Commands/CommandObjectSession.cpp
+++ b/lldb/source/Commands/CommandObjectSession.cpp
@@ -21,9 +21,7 @@ class CommandObjectSessionSave : public CommandObjectParsed {
"If no file if specified, transcripts will be "
"saved to a temporary file.",
"session save [file]") {
- CommandArgumentEntry arg1;
- arg1.emplace_back(eArgTypePath, eArgRepeatOptional);
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypePath, eArgRepeatOptional);
}
~CommandObjectSessionSave() override = default;
diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp
index 0cf3d1daf7f528..7bbb0dd567ab1a 100644
--- a/lldb/source/Commands/CommandObjectSettings.cpp
+++ b/lldb/source/Commands/CommandObjectSettings.cpp
@@ -245,19 +245,7 @@ class CommandObjectSettingsShow : public CommandObjectParsed {
"Show matching debugger settings and their current "
"values. Defaults to showing all settings.",
nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData var_name_arg;
-
- // Define the first (and only) variant of this arg.
- var_name_arg.arg_type = eArgTypeSettingVariableName;
- var_name_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(var_name_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeSettingVariableName, eArgRepeatOptional);
}
~CommandObjectSettingsShow() override = default;
@@ -297,19 +285,7 @@ class CommandObjectSettingsWrite : public CommandObjectParsed {
"current values to a file that can be read in with "
"\"settings read\". Defaults to writing all settings.",
nullptr) {
- CommandArgumentEntry arg1;
- CommandArgumentData var_name_arg;
-
- // Define the first (and only) variant of this arg.
- var_name_arg.arg_type = eArgTypeSettingVariableName;
- var_name_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg1.push_back(var_name_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg1);
+ AddSimpleArgumentList(eArgTypeSettingVariableName, eArgRepeatOptional);
}
~CommandObjectSettingsWrite() override = default;
@@ -997,19 +973,7 @@ class CommandObjectSettingsClear : public CommandObjectParsed {
interpreter, "settings clear",
"Clear a debugger setting array, dictionary, or string. "
"If '-a' option is specified, it clears all settings.", nullptr) {
- CommandArgumentEntry arg;
- CommandArgumentData var_name_arg;
-
- // Define the first (and only) variant of this arg.
- var_name_arg.arg_type = eArgTypeSettingVariableName;
- var_name_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(var_name_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeSettingVariableName);
}
~CommandObjectSettingsClear() override = default;
diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp
index 4e006e4bb0e0fc..45265577e8b61c 100644
--- a/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/lldb/source/Commands/CommandObjectTarget.cpp
@@ -229,19 +229,8 @@ class CommandObjectTargetCreate : public CommandObjectParsed {
m_remote_file(
LLDB_OPT_SET_1, false, "remote-file", 'r', 0, eArgTypeFilename,
"Fullpath to the file on the remote host if debugging remotely.") {
- CommandArgumentEntry arg;
- CommandArgumentData file_arg;
-
- // Define the first (and only) variant of this arg.
- file_arg.arg_type = eArgTypeFilename;
- file_arg.arg_repetition = eArgRepeatPlain;
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(file_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFilename);
m_option_group.Append(&m_arch_option, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Append(&m_platform_options, LLDB_OPT_SET_ALL, 1);
@@ -503,8 +492,7 @@ class CommandObjectTargetSelect : public CommandObjectParsed {
: CommandObjectParsed(
interpreter, "target select",
"Select a target as the current target by target index.", nullptr) {
- CommandArgumentData target_arg{eArgTypeTargetID, eArgRepeatPlain};
- m_arguments.push_back({target_arg});
+ AddSimpleArgumentList(eArgTypeTargetID);
}
~CommandObjectTargetSelect() override = default;
@@ -586,8 +574,7 @@ class CommandObjectTargetDelete : public CommandObjectParsed {
m_option_group.Append(&m_all_option, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Append(&m_cleanup_option, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Finalize();
- CommandArgumentData target_arg{eArgTypeTargetID, eArgRepeatStar};
- m_arguments.push_back({target_arg});
+ AddSimpleArgumentList(eArgTypeTargetID, eArgRepeatStar);
}
~CommandObjectTargetDelete() override = default;
@@ -729,19 +716,7 @@ class CommandObjectTargetVariable : public CommandObjectParsed {
"A basename or fullpath to a shared library to use in the search "
"for global "
"variables. This option can be specified multiple times.") {
- CommandArgumentEntry arg;
- CommandArgumentData var_name_arg;
-
- // Define the first (and only) variant of this arg.
- var_name_arg.arg_type = eArgTypeVarName;
- var_name_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(var_name_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeVarName, eArgRepeatPlus);
m_option_group.Append(&m_varobj_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Append(&m_option_variable, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
@@ -1243,19 +1218,7 @@ class CommandObjectTargetModulesSearchPathsQuery : public CommandObjectParsed {
interpreter, "target modules search-paths query",
"Transform a path using the first applicable image search path.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandArgumentData path_arg;
-
- // Define the first (and only) variant of this arg.
- path_arg.arg_type = eArgTypeDirectoryName;
- path_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(path_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeDirectoryName);
}
~CommandObjectTargetModulesSearchPathsQuery() override = default;
@@ -1881,19 +1844,7 @@ class CommandObjectTargetModulesModuleAutoComplete
const char *syntax,
uint32_t flags = 0)
: CommandObjectParsed(interpreter, name, help, syntax, flags) {
- CommandArgumentEntry arg;
- CommandArgumentData file_arg;
-
- // Define the first (and only) variant of this arg.
- file_arg.arg_type = eArgTypeFilename;
- file_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(file_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFilename, eArgRepeatStar);
}
~CommandObjectTargetModulesModuleAutoComplete() override = default;
@@ -1918,19 +1869,7 @@ class CommandObjectTargetModulesSourceFileAutoComplete
CommandInterpreter &interpreter, const char *name, const char *help,
const char *syntax, uint32_t flags)
: CommandObjectParsed(interpreter, name, help, syntax, flags) {
- CommandArgumentEntry arg;
- CommandArgumentData source_file_arg;
-
- // Define the first (and only) variant of this arg.
- source_file_arg.arg_type = eArgTypeSourceFile;
- source_file_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(source_file_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeSourceFile, eArgRepeatPlus);
}
~CommandObjectTargetModulesSourceFileAutoComplete() override = default;
@@ -2234,8 +2173,7 @@ class CommandObjectTargetModulesDumpClangPCMInfo : public CommandObjectParsed {
interpreter, "target modules dump pcm-info",
"Dump information about the given clang module (pcm).") {
// Take a single file argument.
- CommandArgumentData arg{eArgTypeFilename, eArgRepeatPlain};
- m_arguments.push_back({arg});
+ AddSimpleArgumentList(eArgTypeFilename);
}
~CommandObjectTargetModulesDumpClangPCMInfo() override = default;
@@ -2774,8 +2712,7 @@ class CommandObjectTargetModulesAdd : public CommandObjectParsed {
LLDB_OPT_SET_1);
m_option_group.Append(&m_symbol_file, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
m_option_group.Finalize();
- CommandArgumentData module_arg{eArgTypePath, eArgRepeatStar};
- m_arguments.push_back({module_arg});
+ AddSimpleArgumentList(eArgTypePath, eArgRepeatStar);
}
~CommandObjectTargetModulesAdd() override = default;
@@ -3219,8 +3156,7 @@ class CommandObjectTargetModulesList : public CommandObjectParsed {
: CommandObjectParsed(
interpreter, "target modules list",
"List current executable and dependent shared library images.") {
- CommandArgumentData module_arg{eArgTypeModule, eArgRepeatStar};
- m_arguments.push_back({module_arg});
+ AddSimpleArgumentList(eArgTypeModule, eArgRepeatStar);
}
~CommandObjectTargetModulesList() override = default;
@@ -3992,19 +3928,7 @@ class CommandObjectTargetModulesLookup : public CommandObjectParsed {
"Look up information within executable and "
"dependent shared library images.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandArgumentData file_arg;
-
- // Define the first (and only) variant of this arg.
- file_arg.arg_type = eArgTypeFilename;
- file_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(file_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeFilename, eArgRepeatStar);
}
~CommandObjectTargetModulesLookup() override = default;
@@ -4323,8 +4247,7 @@ class CommandObjectTargetSymbolsAdd : public CommandObjectParsed {
m_option_group.Append(&m_current_stack_option, LLDB_OPT_SET_2,
LLDB_OPT_SET_2);
m_option_group.Finalize();
- CommandArgumentData module_arg{eArgTypeShlibName, eArgRepeatPlain};
- m_arguments.push_back({module_arg});
+ AddSimpleArgumentList(eArgTypeShlibName);
}
~CommandObjectTargetSymbolsAdd() override = default;
@@ -5163,8 +5086,7 @@ class CommandObjectTargetStopHookDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "target stop-hook delete",
"Delete a stop-hook.",
"target stop-hook delete [<idx>]") {
- CommandArgumentData hook_arg{eArgTypeStopHookID, eArgRepeatStar};
- m_arguments.push_back({hook_arg});
+ AddSimpleArgumentList(eArgTypeStopHookID, eArgRepeatStar);
}
~CommandObjectTargetStopHookDelete() override = default;
@@ -5218,8 +5140,7 @@ class CommandObjectTargetStopHookEnableDisable : public CommandObjectParsed {
bool enable, const char *name,
const char *help, const char *syntax)
: CommandObjectParsed(interpreter, name, help, syntax), m_enable(enable) {
- CommandArgumentData hook_arg{eArgTypeStopHookID, eArgRepeatStar};
- m_arguments.push_back({hook_arg});
+ AddSimpleArgumentList(eArgTypeStopHookID, eArgRepeatStar);
}
~CommandObjectTargetStopHookEnableDisable() override = default;
diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index 52e493b13c61ca..9cfff059d6bfa4 100644
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -374,19 +374,7 @@ class CommandObjectThreadStepWithTypeAndScope : public CommandObjectParsed {
eCommandProcessMustBePaused),
m_step_type(step_type), m_step_scope(step_scope),
m_class_options("scripted step") {
- CommandArgumentEntry arg;
- CommandArgumentData thread_id_arg;
-
- // Define the first (and only) variant of this arg.
- thread_id_arg.arg_type = eArgTypeThreadID;
- thread_id_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(thread_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeThreadID, eArgRepeatOptional);
if (step_type == eStepTypeScripted) {
m_all_options.Append(&m_class_options, LLDB_OPT_SET_1 | LLDB_OPT_SET_2,
@@ -643,19 +631,7 @@ class CommandObjectThreadContinue : public CommandObjectParsed {
nullptr,
eCommandRequiresThread | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched | eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData thread_idx_arg;
-
- // Define the first (and only) variant of this arg.
- thread_idx_arg.arg_type = eArgTypeThreadIndex;
- thread_idx_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(thread_idx_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeThreadIndex, eArgRepeatPlus);
}
~CommandObjectThreadContinue() override = default;
@@ -886,19 +862,7 @@ class CommandObjectThreadUntil : public CommandObjectParsed {
nullptr,
eCommandRequiresThread | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched | eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData line_num_arg;
-
- // Define the first (and only) variant of this arg.
- line_num_arg.arg_type = eArgTypeLineNum;
- line_num_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(line_num_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeLineNum);
}
~CommandObjectThreadUntil() override = default;
@@ -1539,19 +1503,7 @@ class CommandObjectThreadReturn : public CommandObjectRaw {
eCommandRequiresFrame | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData expression_arg;
-
- // Define the first (and only) variant of this arg.
- expression_arg.arg_type = eArgTypeExpression;
- expression_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(expression_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeExpression, eArgRepeatOptional);
}
~CommandObjectThreadReturn() override = default;
@@ -1919,19 +1871,7 @@ class CommandObjectThreadPlanDiscard : public CommandObjectParsed {
eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData plan_index_arg;
-
- // Define the first (and only) variant of this arg.
- plan_index_arg.arg_type = eArgTypeUnsignedInteger;
- plan_index_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(plan_index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectThreadPlanDiscard() override = default;
@@ -1992,19 +1932,7 @@ class CommandObjectThreadPlanPrune : public CommandObjectParsed {
eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData tid_arg;
-
- // Define the first (and only) variant of this arg.
- tid_arg.arg_type = eArgTypeThreadID;
- tid_arg.arg_repetition = eArgRepeatStar;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(tid_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeThreadID, eArgRepeatStar);
}
~CommandObjectThreadPlanPrune() override = default;
@@ -2221,8 +2149,7 @@ class CommandObjectTraceDumpFunctionCalls : public CommandObjectParsed {
eCommandRequiresProcess | eCommandRequiresThread |
eCommandTryTargetAPILock | eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused | eCommandProcessMustBeTraced) {
- CommandArgumentData thread_arg{eArgTypeThreadIndex, eArgRepeatOptional};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeThreadIndex, eArgRepeatOptional);
}
~CommandObjectTraceDumpFunctionCalls() override = default;
@@ -2395,8 +2322,7 @@ class CommandObjectTraceDumpInstructions : public CommandObjectParsed {
eCommandRequiresProcess | eCommandRequiresThread |
eCommandTryTargetAPILock | eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused | eCommandProcessMustBeTraced) {
- CommandArgumentData thread_arg{eArgTypeThreadIndex, eArgRepeatOptional};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeThreadIndex, eArgRepeatOptional);
}
~CommandObjectTraceDumpInstructions() override = default;
diff --git a/lldb/source/Commands/CommandObjectThreadUtil.cpp b/lldb/source/Commands/CommandObjectThreadUtil.cpp
index d7fa4190a24509..cdc5946547f47d 100644
--- a/lldb/source/Commands/CommandObjectThreadUtil.cpp
+++ b/lldb/source/Commands/CommandObjectThreadUtil.cpp
@@ -21,8 +21,7 @@ CommandObjectIterateOverThreads::CommandObjectIterateOverThreads(
const char *syntax, uint32_t flags)
: CommandObjectParsed(interpreter, name, help, syntax, flags) {
// These commands all take thread ID's as arguments.
- CommandArgumentData thread_arg{eArgTypeThreadIndex, eArgRepeatStar};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeThreadIndex, eArgRepeatStar);
}
CommandObjectMultipleThreads::CommandObjectMultipleThreads(
@@ -30,8 +29,7 @@ CommandObjectMultipleThreads::CommandObjectMultipleThreads(
const char *syntax, uint32_t flags)
: CommandObjectParsed(interpreter, name, help, syntax, flags) {
// These commands all take thread ID's as arguments.
- CommandArgumentData thread_arg{eArgTypeThreadIndex, eArgRepeatStar};
- m_arguments.push_back({thread_arg});
+ AddSimpleArgumentList(eArgTypeThreadIndex, eArgRepeatStar);
}
void CommandObjectIterateOverThreads::DoExecute(Args &command,
diff --git a/lldb/source/Commands/CommandObjectTrace.cpp b/lldb/source/Commands/CommandObjectTrace.cpp
index e0c74e29aaa6bc..5bcbc236301cc1 100644
--- a/lldb/source/Commands/CommandObjectTrace.cpp
+++ b/lldb/source/Commands/CommandObjectTrace.cpp
@@ -89,8 +89,7 @@ class CommandObjectTraceSave : public CommandObjectParsed {
eCommandRequiresProcess | eCommandTryTargetAPILock |
eCommandProcessMustBeLaunched | eCommandProcessMustBePaused |
eCommandProcessMustBeTraced) {
- CommandArgumentData bundle_dir{eArgTypeDirectoryName, eArgRepeatPlain};
- m_arguments.push_back({bundle_dir});
+ AddSimpleArgumentList(eArgTypeDirectoryName);
}
void
@@ -176,8 +175,7 @@ class CommandObjectTraceLoad : public CommandObjectParsed {
interpreter, "trace load",
"Load a post-mortem processor trace session from a trace bundle.",
"trace load <trace_description_file>") {
- CommandArgumentData session_file_arg{eArgTypeFilename, eArgRepeatPlain};
- m_arguments.push_back({session_file_arg});
+ AddSimpleArgumentList(eArgTypeFilename);
}
void
@@ -332,8 +330,7 @@ class CommandObjectTraceSchema : public CommandObjectParsed {
"Show the schema of the given trace plugin.",
"trace schema <plug-in>. Use the plug-in name "
"\"all\" to see all schemas.\n") {
- CommandArgumentData plugin_arg{eArgTypeNone, eArgRepeatPlain};
- m_arguments.push_back({plugin_arg});
+ AddSimpleArgumentList(eArgTypeNone);
}
~CommandObjectTraceSchema() override = default;
diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp
index 036b8e9d9def13..97489bdc2d9c28 100644
--- a/lldb/source/Commands/CommandObjectType.cpp
+++ b/lldb/source/Commands/CommandObjectType.cpp
@@ -589,15 +589,7 @@ class CommandObjectTypeFormatAdd : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type format add",
"Add a new formatting style for a type.", nullptr),
m_format_options(eFormatInvalid) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
SetHelpLong(
R"(
@@ -784,15 +776,7 @@ class CommandObjectTypeFormatterDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter,
FormatCategoryToString(formatter_kind, false)),
m_formatter_kind(formatter_kind) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlain;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName);
const char *kind = FormatCategoryToString(formatter_kind, true);
const char *short_kind = FormatCategoryToString(formatter_kind, false);
@@ -929,8 +913,7 @@ class CommandObjectTypeFormatterClear : public CommandObjectParsed {
const char *name, const char *help)
: CommandObjectParsed(interpreter, name, help, nullptr),
m_formatter_kind(formatter_kind) {
- CommandArgumentData category_arg{eArgTypeName, eArgRepeatOptional};
- m_arguments.push_back({category_arg});
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatOptional);
}
~CommandObjectTypeFormatterClear() override = default;
@@ -1045,15 +1028,7 @@ class CommandObjectTypeFormatterList : public CommandObjectParsed {
CommandObjectTypeFormatterList(CommandInterpreter &interpreter,
const char *name, const char *help)
: CommandObjectParsed(interpreter, name, help, nullptr), m_options() {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatOptional;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatOptional);
}
~CommandObjectTypeFormatterList() override = default;
@@ -1445,15 +1420,7 @@ CommandObjectTypeSummaryAdd::CommandObjectTypeSummaryAdd(
: CommandObjectParsed(interpreter, "type summary add",
"Add a new summary style for a type.", nullptr),
IOHandlerDelegateMultiline("DONE"), m_options(interpreter) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
SetHelpLong(
R"(
@@ -1745,15 +1712,7 @@ class CommandObjectTypeCategoryDefine : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type category define",
"Define a new category as a source of formatters.",
nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
}
~CommandObjectTypeCategoryDefine() override = default;
@@ -1838,15 +1797,7 @@ class CommandObjectTypeCategoryEnable : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type category enable",
"Enable a category as a source of formatters.",
nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
}
~CommandObjectTypeCategoryEnable() override = default;
@@ -1897,15 +1848,7 @@ class CommandObjectTypeCategoryDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type category delete",
"Delete a category and all associated formatters.",
nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
}
~CommandObjectTypeCategoryDelete() override = default;
@@ -1996,15 +1939,7 @@ class CommandObjectTypeCategoryDisable : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type category disable",
"Disable a category as a source of formatters.",
nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
}
~CommandObjectTypeCategoryDisable() override = default;
@@ -2050,15 +1985,7 @@ class CommandObjectTypeCategoryList : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "type category list",
"Provide a list of all existing categories.",
nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatOptional;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatOptional);
}
~CommandObjectTypeCategoryList() override = default;
@@ -2271,15 +2198,7 @@ CommandObjectTypeSynthAdd::CommandObjectTypeSynthAdd(
: CommandObjectParsed(interpreter, "type synthetic add",
"Add a new synthetic provider for a type.", nullptr),
IOHandlerDelegateMultiline("DONE"), m_options() {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
}
bool CommandObjectTypeSynthAdd::AddSynth(ConstString type_name,
@@ -2476,15 +2395,7 @@ class CommandObjectTypeFilterAdd : public CommandObjectParsed {
CommandObjectTypeFilterAdd(CommandInterpreter &interpreter)
: CommandObjectParsed(interpreter, "type filter add",
"Add a new filter for a type.", nullptr) {
- CommandArgumentEntry type_arg;
- CommandArgumentData type_style_arg;
-
- type_style_arg.arg_type = eArgTypeName;
- type_style_arg.arg_repetition = eArgRepeatPlus;
-
- type_arg.push_back(type_style_arg);
-
- m_arguments.push_back(type_arg);
+ AddSimpleArgumentList(eArgTypeName, eArgRepeatPlus);
SetHelpLong(
R"(
diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp
index 5b74b1ae43accc..f123211e723779 100644
--- a/lldb/source/Commands/CommandObjectWatchpoint.cpp
+++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp
@@ -153,12 +153,7 @@ class CommandObjectWatchpointList : public CommandObjectParsed {
interpreter, "watchpoint list",
"List all watchpoints at configurable levels of detail.", nullptr,
eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointList() override = default;
@@ -276,12 +271,7 @@ class CommandObjectWatchpointEnable : public CommandObjectParsed {
"Enable the specified disabled watchpoint(s). If "
"no watchpoints are specified, enable all of them.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointEnable() override = default;
@@ -350,12 +340,7 @@ class CommandObjectWatchpointDisable : public CommandObjectParsed {
"removing it/them. If no watchpoints are "
"specified, disable them all.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointDisable() override = default;
@@ -429,12 +414,7 @@ class CommandObjectWatchpointDelete : public CommandObjectParsed {
"Delete the specified watchpoint(s). If no "
"watchpoints are specified, delete them all.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointDelete() override = default;
@@ -550,12 +530,7 @@ class CommandObjectWatchpointIgnore : public CommandObjectParsed {
"Set ignore count on the specified watchpoint(s). "
"If no watchpoints are specified, set them all.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointIgnore() override = default;
@@ -673,12 +648,7 @@ class CommandObjectWatchpointModify : public CommandObjectParsed {
"watchpoint. "
"Passing an empty argument clears the modification.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandObject::AddIDsArgumentData(arg, eArgTypeWatchpointID,
- eArgTypeWatchpointIDRange);
- // Add the entry for the first argument for this command to the object's
- // arguments vector.
- m_arguments.push_back(arg);
+ CommandObject::AddIDsArgumentData(eWatchpointArgs);
}
~CommandObjectWatchpointModify() override = default;
@@ -811,18 +781,7 @@ class CommandObjectWatchpointSetVariable : public CommandObjectParsed {
" Watches my_global_var for read/write access, with the region to watch \
corresponding to the byte size of the data type.");
- CommandArgumentEntry arg;
- CommandArgumentData var_name_arg;
-
- // Define the only variant of this arg.
- var_name_arg.arg_type = eArgTypeVarName;
- var_name_arg.arg_repetition = eArgRepeatPlain;
-
- // Push the variant into the argument entry.
- arg.push_back(var_name_arg);
-
- // Push the data for the only argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeVarName);
// Absorb the '-w' and '-s' options into our option group.
m_option_group.Append(&m_option_watchpoint, LLDB_OPT_SET_1, LLDB_OPT_SET_1);
@@ -1009,18 +968,7 @@ class CommandObjectWatchpointSetExpression : public CommandObjectRaw {
Watches write access for the 1-byte region pointed to by the address 'foo + 32')");
- CommandArgumentEntry arg;
- CommandArgumentData expression_arg;
-
- // Define the only variant of this arg.
- expression_arg.arg_type = eArgTypeExpression;
- expression_arg.arg_repetition = eArgRepeatPlain;
-
- // Push the only variant into the argument entry.
- arg.push_back(expression_arg);
-
- // Push the data for the only argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeExpression);
// Absorb the '-w' and '-s' options into our option group.
m_option_group.Append(&m_option_watchpoint, LLDB_OPT_SET_ALL,
diff --git a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
index b1629ceab27098..aaf14540cb2827 100644
--- a/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
+++ b/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
@@ -162,19 +162,7 @@ initialized:"
"Final Note: A warning that no watchpoint command was generated when there \
are no syntax errors may indicate that a function was declared but never called.");
- CommandArgumentEntry arg;
- CommandArgumentData wp_id_arg;
-
- // Define the first (and only) variant of this arg.
- wp_id_arg.arg_type = eArgTypeWatchpointID;
- wp_id_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(wp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeWatchpointID);
}
~CommandObjectWatchpointCommandAdd() override = default;
@@ -455,19 +443,7 @@ class CommandObjectWatchpointCommandDelete : public CommandObjectParsed {
: CommandObjectParsed(interpreter, "delete",
"Delete the set of commands from a watchpoint.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandArgumentData wp_id_arg;
-
- // Define the first (and only) variant of this arg.
- wp_id_arg.arg_type = eArgTypeWatchpointID;
- wp_id_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(wp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeWatchpointID);
}
~CommandObjectWatchpointCommandDelete() override = default;
@@ -522,19 +498,7 @@ class CommandObjectWatchpointCommandList : public CommandObjectParsed {
"List the script or set of commands to be executed "
"when the watchpoint is hit.",
nullptr, eCommandRequiresTarget) {
- CommandArgumentEntry arg;
- CommandArgumentData wp_id_arg;
-
- // Define the first (and only) variant of this arg.
- wp_id_arg.arg_type = eArgTypeWatchpointID;
- wp_id_arg.arg_repetition = eArgRepeatPlain;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(wp_id_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeWatchpointID);
}
~CommandObjectWatchpointCommandList() override = default;
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index 93c53e89f7d1ae..4634b75c6a33a9 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -392,6 +392,24 @@ bool CommandObject::ParseOptionsAndNotify(Args &args,
return true;
}
+void CommandObject::AddSimpleArgumentList(
+ CommandArgumentType arg_type, ArgumentRepetitionType repetition_type) {
+
+ CommandArgumentEntry arg_entry;
+ CommandArgumentData simple_arg;
+
+ // Define the first (and only) variant of this arg.
+ simple_arg.arg_type = arg_type;
+ simple_arg.arg_repetition = repetition_type;
+
+ // There is only one variant this argument could be; put it into the argument
+ // entry.
+ arg_entry.push_back(simple_arg);
+
+ // Push the data for the first argument into the m_arguments vector.
+ m_arguments.push_back(arg_entry);
+}
+
int CommandObject::GetNumArgumentEntries() { return m_arguments.size(); }
CommandObject::CommandArgumentEntry *
@@ -694,20 +712,24 @@ void CommandObject::GenerateHelpText(Stream &output_strm) {
}
}
-void CommandObject::AddIDsArgumentData(CommandArgumentEntry &arg,
- CommandArgumentType ID,
- CommandArgumentType IDRange) {
+void CommandObject::AddIDsArgumentData(CommandObject::IDType type) {
+ CommandArgumentEntry arg;
CommandArgumentData id_arg;
CommandArgumentData id_range_arg;
// Create the first variant for the first (and only) argument for this
// command.
- id_arg.arg_type = ID;
+ switch (type) {
+ case eBreakpointArgs:
+ id_arg.arg_type = eArgTypeBreakpointID;
+ id_range_arg.arg_type = eArgTypeBreakpointIDRange;
+ break;
+ case eWatchpointArgs:
+ id_arg.arg_type = eArgTypeWatchpointID;
+ id_range_arg.arg_type = eArgTypeWatchpointIDRange;
+ break;
+ }
id_arg.arg_repetition = eArgRepeatOptional;
-
- // Create the second variant for the first (and only) argument for this
- // command.
- id_range_arg.arg_type = IDRange;
id_range_arg.arg_repetition = eArgRepeatOptional;
// The first (and only) argument for this command could be either an id or an
@@ -715,6 +737,7 @@ void CommandObject::AddIDsArgumentData(CommandArgumentEntry &arg,
// this command.
arg.push_back(id_arg);
arg.push_back(id_range_arg);
+ m_arguments.push_back(arg);
}
const char *CommandObject::GetArgumentTypeAsCString(
diff --git a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index 47b1db16f1e904..7af768aad0bc19 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -419,19 +419,7 @@ class CommandObjectMultiwordItaniumABI_Demangle : public CommandObjectParsed {
: CommandObjectParsed(
interpreter, "demangle", "Demangle a C++ mangled name.",
"language cplusplus demangle [<mangled-name> ...]") {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeSymbol;
- index_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeSymbol, eArgRepeatPlus);
}
~CommandObjectMultiwordItaniumABI_Demangle() override = default;
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
index f380d6e7e67205..3e5ee6f6637303 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -897,19 +897,7 @@ class CommandObjectObjC_ClassTable_Dump : public CommandObjectParsed {
eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused),
m_options() {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeRegularExpression;
- index_arg.arg_repetition = eArgRepeatOptional;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeRegularExpression, eArgRepeatOptional);
}
~CommandObjectObjC_ClassTable_Dump() override = default;
@@ -1015,19 +1003,7 @@ class CommandObjectMultiwordObjC_TaggedPointer_Info
"language objc tagged-pointer info",
eCommandRequiresProcess | eCommandProcessMustBeLaunched |
eCommandProcessMustBePaused) {
- CommandArgumentEntry arg;
- CommandArgumentData index_arg;
-
- // Define the first (and only) variant of this arg.
- index_arg.arg_type = eArgTypeAddress;
- index_arg.arg_repetition = eArgRepeatPlus;
-
- // There is only one variant this argument could be; put it into the
- // argument entry.
- arg.push_back(index_arg);
-
- // Push the data for the first argument into the m_arguments vector.
- m_arguments.push_back(arg);
+ AddSimpleArgumentList(eArgTypeAddress, eArgRepeatPlus);
}
~CommandObjectMultiwordObjC_TaggedPointer_Info() override = default;
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 3dc40ee6bb9ffc..51ceb12f1a5709 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -5354,8 +5354,7 @@ class CommandObjectProcessGDBRemotePacketXferSize : public CommandObjectParsed {
interpreter, "process plugin packet xfer-size",
"Maximum size that lldb will try to read/write one one chunk.",
nullptr) {
- CommandArgumentData max_arg{eArgTypeUnsignedInteger, eArgRepeatPlain};
- m_arguments.push_back({max_arg});
+ AddSimpleArgumentList(eArgTypeUnsignedInteger);
}
~CommandObjectProcessGDBRemotePacketXferSize() override = default;
@@ -5397,8 +5396,7 @@ class CommandObjectProcessGDBRemotePacketSend : public CommandObjectParsed {
"be added to the packet prior to sending and "
"stripped from the result.",
nullptr) {
- CommandArgumentData packet_arg{eArgTypeNone, eArgRepeatStar};
- m_arguments.push_back({packet_arg});
+ AddSimpleArgumentList(eArgTypeNone, eArgRepeatStar);
}
~CommandObjectProcessGDBRemotePacketSend() override = default;
More information about the lldb-commits
mailing list