tatyana-krasnukha updated this revision to Diff 167475.
tatyana-krasnukha added a comment.
Modifies Driver::ParseArgs checks
Repository:
rLLDB LLDB
https://reviews.llvm.org/D52604
Files:
include/lldb/Target/Platform.h
source/Commands/CommandObjectDisassemble.h
source/Commands/CommandObjectExpression.h
tools/driver/Driver.cpp
tools/driver/Driver.h
Index: tools/driver/Driver.h
===================================================================
--- tools/driver/Driver.h
+++ tools/driver/Driver.h
@@ -68,8 +68,6 @@
void AddInitialCommand(const char *command, CommandPlacement placement,
bool is_file, lldb::SBError &error);
- // static OptionDefinition m_cmd_option_table[];
-
struct InitialCmdEntry {
InitialCmdEntry(const char *in_contents, bool in_is_file,
bool is_cwd_lldbinit_file_read, bool in_quiet = false)
Index: tools/driver/Driver.cpp
===================================================================
--- tools/driver/Driver.cpp
+++ tools/driver/Driver.cpp
@@ -9,6 +9,7 @@
#include "Driver.h"
+#include <algorithm>
#include <atomic>
#include <csignal>
#include <fcntl.h>
@@ -46,6 +47,7 @@
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
#include <thread>
+#include <utility>
#if !defined(__APPLE__)
#include "llvm/Support/DataTypes.h"
@@ -87,7 +89,7 @@
#define LLDB_3_TO_5 LLDB_OPT_SET_3 | LLDB_OPT_SET_4 | LLDB_OPT_SET_5
#define LLDB_4_TO_5 LLDB_OPT_SET_4 | LLDB_OPT_SET_5
-static OptionDefinition g_options[] = {
+static constexpr OptionDefinition g_options[] = {
{LLDB_OPT_SET_1, true, "help", 'h', no_argument, 0, eArgTypeNone,
"Prints out the usage information for the LLDB debugger."},
{LLDB_OPT_SET_2, true, "version", 'v', no_argument, 0, eArgTypeNone,
@@ -159,8 +161,9 @@
{LLDB_OPT_SET_7, true, "repl", 'r', optional_argument, 0, eArgTypeNone,
"Runs lldb in REPL mode with a stub process."},
{LLDB_OPT_SET_7, true, "repl-language", 'R', required_argument, 0,
- eArgTypeNone, "Chooses the language for the REPL."},
- {0, false, NULL, 0, 0, 0, eArgTypeNone, NULL}};
+ eArgTypeNone, "Chooses the language for the REPL."}};
+
+static constexpr auto g_num_options = sizeof(g_options)/sizeof(OptionDefinition);
static const uint32_t last_option_set_with_args = 2;
@@ -229,8 +232,7 @@
}
}
-void ShowUsage(FILE *out, OptionDefinition *option_table,
- Driver::OptionData data) {
+static void ShowUsage(FILE *out, Driver::OptionData data) {
uint32_t screen_width = 80;
uint32_t indent_level = 0;
const char *name = "lldb";
@@ -245,12 +247,10 @@
// [options-for-level-1]
// etc.
- uint32_t num_options;
uint32_t num_option_sets = 0;
- for (num_options = 0; option_table[num_options].long_option != NULL;
- ++num_options) {
- uint32_t this_usage_mask = option_table[num_options].usage_mask;
+ for (const auto &opt : g_options) {
+ uint32_t this_usage_mask = opt.usage_mask;
if (this_usage_mask == LLDB_OPT_SET_ALL) {
if (num_option_sets == 0)
num_option_sets = 1;
@@ -274,32 +274,32 @@
fprintf(out, "%*s%s", indent_level, "", name);
bool is_help_line = false;
- for (uint32_t i = 0; i < num_options; ++i) {
- if (option_table[i].usage_mask & opt_set_mask) {
- CommandArgumentType arg_type = option_table[i].argument_type;
+ for (const auto &opt : g_options) {
+ if (opt.usage_mask & opt_set_mask) {
+ CommandArgumentType arg_type = opt.argument_type;
const char *arg_name =
SBCommandInterpreter::GetArgumentTypeAsCString(arg_type);
// This is a bit of a hack, but there's no way to say certain options
// don't have arguments yet...
// so we do it by hand here.
- if (option_table[i].short_option == 'h')
+ if (opt.short_option == 'h')
is_help_line = true;
- if (option_table[i].required) {
- if (option_table[i].option_has_arg == required_argument)
- fprintf(out, " -%c <%s>", option_table[i].short_option, arg_name);
- else if (option_table[i].option_has_arg == optional_argument)
- fprintf(out, " -%c [<%s>]", option_table[i].short_option, arg_name);
+ if (opt.required) {
+ if (opt.option_has_arg == required_argument)
+ fprintf(out, " -%c <%s>", opt.short_option, arg_name);
+ else if (opt.option_has_arg == optional_argument)
+ fprintf(out, " -%c [<%s>]", opt.short_option, arg_name);
else
- fprintf(out, " -%c", option_table[i].short_option);
+ fprintf(out, " -%c", opt.short_option);
} else {
- if (option_table[i].option_has_arg == required_argument)
- fprintf(out, " [-%c <%s>]", option_table[i].short_option, arg_name);
- else if (option_table[i].option_has_arg == optional_argument)
- fprintf(out, " [-%c [<%s>]]", option_table[i].short_option,
+ if (opt.option_has_arg == required_argument)
+ fprintf(out, " [-%c <%s>]", opt.short_option, arg_name);
+ else if (opt.option_has_arg == optional_argument)
+ fprintf(out, " [-%c [<%s>]]", opt.short_option,
arg_name);
else
- fprintf(out, " [-%c]", option_table[i].short_option);
+ fprintf(out, " [-%c]", opt.short_option);
}
}
}
@@ -325,25 +325,25 @@
indent_level += 5;
- for (uint32_t i = 0; i < num_options; ++i) {
+ for (const auto &opt : g_options) {
// Only print this option if we haven't already seen it.
- pos = options_seen.find(option_table[i].short_option);
+ pos = options_seen.find(opt.short_option);
if (pos == options_seen.end()) {
- CommandArgumentType arg_type = option_table[i].argument_type;
+ CommandArgumentType arg_type = opt.argument_type;
const char *arg_name =
SBCommandInterpreter::GetArgumentTypeAsCString(arg_type);
- options_seen.insert(option_table[i].short_option);
- fprintf(out, "%*s-%c ", indent_level, "", option_table[i].short_option);
+ options_seen.insert(opt.short_option);
+ fprintf(out, "%*s-%c ", indent_level, "", opt.short_option);
if (arg_type != eArgTypeNone)
fprintf(out, "<%s>", arg_name);
fprintf(out, "\n");
- fprintf(out, "%*s--%s ", indent_level, "", option_table[i].long_option);
+ fprintf(out, "%*s--%s ", indent_level, "", opt.long_option);
if (arg_type != eArgTypeNone)
fprintf(out, "<%s>", arg_name);
fprintf(out, "\n");
indent_level += 5;
- OutputFormattedUsageText(out, indent_level, option_table[i].usage_text,
+ OutputFormattedUsageText(out, indent_level, opt.usage_text,
screen_width);
indent_level -= 5;
fprintf(out, "\n");
@@ -380,26 +380,19 @@
"");
}
-void BuildGetOptTable(OptionDefinition *expanded_option_table,
- std::vector<struct option> &getopt_table,
- uint32_t num_options) {
- if (num_options == 0)
- return;
+ static void BuildGetOptTable(std::vector<option> &getopt_table) {
+ getopt_table.resize(g_num_options + 1);
- uint32_t i;
- uint32_t j;
std::bitset<256> option_seen;
-
- getopt_table.resize(num_options + 1);
-
- for (i = 0, j = 0; i < num_options; ++i) {
- char short_opt = expanded_option_table[i].short_option;
+ uint32_t j = 0;
+ for (const auto &opt : g_options) {
+ char short_opt = opt.short_option;
if (option_seen.test(short_opt) == false) {
- getopt_table[j].name = expanded_option_table[i].long_option;
- getopt_table[j].has_arg = expanded_option_table[i].option_has_arg;
+ getopt_table[j].name = opt.long_option;
+ getopt_table[j].has_arg = opt.option_has_arg;
getopt_table[j].flag = NULL;
- getopt_table[j].val = expanded_option_table[i].short_option;
+ getopt_table[j].val = opt.short_option;
option_seen.set(short_opt);
++j;
}
@@ -580,44 +573,30 @@
SBError Driver::ParseArgs(int argc, const char *argv[], FILE *out_fh,
bool &exiting) {
+ static_assert(g_num_options > 0, "cannot handle arguments");
+
ResetOptionValues();
- SBCommandReturnObject result;
+ // No arguments or just program name, nothing to parse.
+ if (argc <= 1)
+ return SBError();
SBError error;
- std::string option_string;
- struct option *long_options = NULL;
- std::vector<struct option> long_options_vector;
- uint32_t num_options;
-
- for (num_options = 0; g_options[num_options].long_option != NULL;
- ++num_options)
- /* Do Nothing. */;
-
- if (num_options == 0) {
- if (argc > 1)
- error.SetErrorStringWithFormat("invalid number of options");
- return error;
- }
-
- BuildGetOptTable(g_options, long_options_vector, num_options);
-
- if (long_options_vector.empty())
- long_options = NULL;
- else
- long_options = &long_options_vector.front();
-
- if (long_options == NULL) {
+ std::vector<option> long_options_vector;
+ BuildGetOptTable(long_options_vector);
+ if (long_options_vector.empty()) {
error.SetErrorStringWithFormat("invalid long options");
return error;
}
// Build the option_string argument for call to getopt_long_only.
-
- for (int i = 0; long_options[i].name != NULL; ++i) {
- if (long_options[i].flag == NULL) {
- option_string.push_back((char)long_options[i].val);
- switch (long_options[i].has_arg) {
+ std::string option_string;
+ auto sentinel_it = std::prev(std::end(long_options_vector));
+ for (auto long_opt_it = long_options_vector.begin();
+ long_opt_it != sentinel_it; ++long_opt_it) {
+ if (long_opt_it->flag == nullptr) {
+ option_string.push_back(static_cast<char>(long_opt_it->val));
+ switch (long_opt_it->has_arg) {
default:
case no_argument:
break;
@@ -655,7 +634,7 @@
while (1) {
int long_options_index = -1;
val = ::getopt_long_only(argc, const_cast<char **>(argv),
- option_string.c_str(), long_options,
+ option_string.c_str(), long_options_vector.data(),
&long_options_index);
if (val == -1)
@@ -669,14 +648,11 @@
else {
m_option_data.m_seen_options.insert((char)val);
if (long_options_index == -1) {
- for (int i = 0; long_options[i].name || long_options[i].has_arg ||
- long_options[i].flag || long_options[i].val;
- ++i) {
- if (long_options[i].val == val) {
- long_options_index = i;
- break;
- }
- }
+ auto long_opt_it = std::find_if(long_options_vector.begin(), sentinel_it,
+ [val](const option& long_option) { return long_option.val == val; });
+ if (long_options_vector.end() != long_opt_it)
+ long_options_index =
+ std::distance(std::begin(long_options_vector), long_opt_it);
}
if (long_options_index >= 0) {
@@ -829,7 +805,7 @@
}
if (error.Fail() || m_option_data.m_print_help) {
- ShowUsage(out_fh, g_options, m_option_data);
+ ShowUsage(out_fh, m_option_data);
exiting = true;
} else if (m_option_data.m_print_version) {
::fprintf(out_fh, "%s\n", m_debugger.GetVersionString());
Index: source/Commands/CommandObjectExpression.h
===================================================================
--- source/Commands/CommandObjectExpression.h
+++ source/Commands/CommandObjectExpression.h
@@ -39,9 +39,6 @@
void OptionParsingStarting(ExecutionContext *execution_context) override;
- // Options table: Required for subclasses of Options.
-
- static OptionDefinition g_option_table[];
bool top_level;
bool unwind_on_error;
bool ignore_breakpoints;
Index: source/Commands/CommandObjectDisassemble.h
===================================================================
--- source/Commands/CommandObjectDisassemble.h
+++ source/Commands/CommandObjectDisassemble.h
@@ -65,7 +65,6 @@
// "at_pc". This should be set
// in SetOptionValue if anything the selects a location is set.
lldb::addr_t symbol_containing_addr;
- static OptionDefinition g_option_table[];
};
CommandObjectDisassemble(CommandInterpreter &interpreter);
Index: include/lldb/Target/Platform.h
===================================================================
--- include/lldb/Target/Platform.h
+++ include/lldb/Target/Platform.h
@@ -1131,10 +1131,6 @@
llvm::ArrayRef<OptionDefinition> GetDefinitions() override;
- // Options table: Required for subclasses of Options.
-
- static lldb_private::OptionDefinition g_option_table[];
-
// Instance variables to hold the values for command options.
bool m_rsync;
@@ -1160,10 +1156,6 @@
llvm::ArrayRef<OptionDefinition> GetDefinitions() override;
- // Options table: Required for subclasses of Options.
-
- static lldb_private::OptionDefinition g_option_table[];
-
// Instance variables to hold the values for command options.
bool m_ssh;
@@ -1187,10 +1179,6 @@
llvm::ArrayRef<OptionDefinition> GetDefinitions() override;
- // Options table: Required for subclasses of Options.
-
- static lldb_private::OptionDefinition g_option_table[];
-
// Instance variables to hold the values for command options.
std::string m_cache_dir;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
