caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decoupled Options from CommandInterpreter.

Browse Source 
Options used to store a reference to the CommandInterpreter instance
in the base Options class.  This made it impossible to parse options
independent of a CommandInterpreter.

This change removes the reference from the base class.  Instead, it
modifies the options-parsing-related methods to take an
ExecutionContext pointer, which the options may inspect if they need
to do so.

Closes https://reviews.llvm.org/D23416
Reviewers: clayborg, jingham

llvm-svn: 278440
This commit is contained in:
Todd Fiala
2016-08-11 23:51:28 +00:00
parent 1602421c85
commit e1cfbc7942
69 changed files with 915 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
View File

@@ -3659,7 +3659,7 @@ public:
"Sets a breakpoint on a renderscript kernel.",
"renderscript kernel breakpoint set <kernel_name> [-c x,y,z]",
eCommandRequiresProcess | eCommandProcessMustBeLaunched | eCommandProcessMustBePaused),
m_options(interpreter)
m_options()
{
}
@@ -3674,12 +3674,13 @@ public:
class CommandOptions : public Options
{
public:
CommandOptions(CommandInterpreter &interpreter) : Options(interpreter) {}
CommandOptions() : Options() {}
~CommandOptions() override = default;
Error
SetOptionValue(uint32_t option_idx, const char *option_arg) override
SetOptionValue(uint32_t option_idx, const char *option_arg,
ExecutionContext *execution_context) override
{
Error error;
const int short_option = m_getopt_table[option_idx].val;
@@ -3726,7 +3727,7 @@ public:
}
void
OptionParsingStarting() override
OptionParsingStarting(ExecutionContext *execution_context) override
{
// -1 means the -c option hasn't been set
m_coord[0] = -1;
@@ -3950,7 +3951,7 @@ public:
: CommandObjectParsed(interpreter, "renderscript allocation dump",
"Displays the contents of a particular allocation", "renderscript allocation dump <ID>",
eCommandRequiresProcess | eCommandProcessMustBeLaunched),
m_options(interpreter)
m_options()
{
}
@@ -3965,12 +3966,13 @@ public:
class CommandOptions : public Options
{
public:
CommandOptions(CommandInterpreter &interpreter) : Options(interpreter) {}
CommandOptions() : Options() {}
~CommandOptions() override = default;
Error
SetOptionValue(uint32_t option_idx, const char *option_arg) override
SetOptionValue(uint32_t option_idx, const char *option_arg,
ExecutionContext *execution_context) override
{
Error error;
const int short_option = m_getopt_table[option_idx].val;
@@ -3993,7 +3995,7 @@ public:
}
void
OptionParsingStarting() override
OptionParsingStarting(ExecutionContext *execution_context) override
{
m_outfile.Clear();
}
@@ -4084,7 +4086,7 @@ public:
: CommandObjectParsed(interpreter, "renderscript allocation list",
"List renderscript allocations and their information.", "renderscript allocation list",
eCommandRequiresProcess | eCommandProcessMustBeLaunched),
m_options(interpreter)
m_options()
{
}
@@ -4099,12 +4101,13 @@ public:
class CommandOptions : public Options
{
public:
CommandOptions(CommandInterpreter &interpreter) : Options(interpreter), m_id(0) {}
CommandOptions() : Options(), m_id(0) {}
~CommandOptions() override = default;
Error
SetOptionValue(uint32_t option_idx, const char *option_arg) override
SetOptionValue(uint32_t option_idx, const char *option_arg,
ExecutionContext *execution_context) override
{
Error error;
const int short_option = m_getopt_table[option_idx].val;
@@ -4125,7 +4128,7 @@ public:
}
void
OptionParsingStarting() override
OptionParsingStarting(ExecutionContext *execution_context) override
{
m_id = 0;
}