Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make complete_options save arguments too

Browse Source
This commit is contained in:
Pedro Alves
2019-06-25 16:58:50 +01:00
parent 4b4de9f875
commit 2d3081ce81
1 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
gdb/cli/cli-option.c
View File

@@ -58,6 +58,8 @@ struct option_def_and_value
gdb::optional<option_value> value; gdb::optional<option_value> value;
}; };
static void save_option_value_in_ctx (gdb::optional<option_def_and_value> &ov);
/* Info passed around when handling completion. */ /* Info passed around when handling completion. */
struct parse_option_completion_info struct parse_option_completion_info
{ {
@@ -456,6 +458,11 @@ complete_options (completion_tracker &tracker,
(*args - text); (*args - text);
return true; return true;
} }
/* If the caller passed in a context, then it is
interested in the option argument values. */
if (ov && ov->ctx != nullptr)
save_option_value_in_ctx (ov);
} }
else else
{ {
@@ -499,6 +506,36 @@ complete_options (completion_tracker &tracker,
return false; return false;
} }
/* Save the parsed value in the option's context. */
static void
save_option_value_in_ctx (gdb::optional<option_def_and_value> &ov)
{
switch (ov->option.type)
{
case var_boolean:
{
bool value = ov->value.has_value () ? ov->value->boolean : true;
*ov->option.var_address.boolean (ov->option, ov->ctx) = value;
}
break;
case var_uinteger:
*ov->option.var_address.uinteger (ov->option, ov->ctx)
= ov->value->uinteger;
break;
case var_zuinteger_unlimited:
*ov->option.var_address.integer (ov->option, ov->ctx)
= ov->value->integer;
break;
case var_enum:
*ov->option.var_address.enumeration (ov->option, ov->ctx)
= ov->value->enumeration;
break;
default:
gdb_assert_not_reached ("unhandled option type");
}
}
/* See cli-option.h. */ /* See cli-option.h. */
bool bool
@@ -534,29 +571,7 @@ process_options (const char **args,
processed_any = true; processed_any = true;
switch (ov->option.type) save_option_value_in_ctx (ov);
{
case var_boolean:
{
bool value = ov->value.has_value () ? ov->value->boolean : true;
*ov->option.var_address.boolean (ov->option, ov->ctx) = value;
}
break;
case var_uinteger:
*ov->option.var_address.uinteger (ov->option, ov->ctx)
= ov->value->uinteger;
break;
case var_zuinteger_unlimited:
*ov->option.var_address.integer (ov->option, ov->ctx)
= ov->value->integer;
break;
case var_enum:
*ov->option.var_address.enumeration (ov->option, ov->ctx)
= ov->value->enumeration;
break;
default:
gdb_assert_not_reached ("unhandled option type");
}
} }
} }