/* Header file for command creation.
- Copyright (C) 1986-2021 Free Software Foundation, Inc.
+ Copyright (C) 1986-2022 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Note that help accepts unambiguous abbreviated class names. */
/* Special classes to help_list */
- class_deprecated = -3,
all_classes = -2, /* help without <classname> */
all_commands = -1, /* all */
return t == var_enum;
}
-/* Function signature for a callback used to get a value from a setting. */
+template<bool is_scalar, typename T> struct setting_func_types_1;
template<typename T>
-using setting_getter_ftype = const T &(*) ();
+struct setting_func_types_1<true, T>
+{
+ using type = T;
+ using set = void (*) (type);
+ using get = type (*) ();
+};
-/* Function signature for a callback used to set a value to a setting. */
+template<typename T>
+struct setting_func_types_1<false, T>
+{
+ using type = const T &;
+ using set = void (*) (type);
+ using get = type (*) ();
+};
template<typename T>
-using setting_setter_ftype = void (*) (const T &);
+struct setting_func_types
+{
+ using type = typename setting_func_types_1<std::is_scalar<T>::value, T>::type;
+ using set = typename setting_func_types_1<std::is_scalar<T>::value, T>::set;
+ using get = typename setting_func_types_1<std::is_scalar<T>::value, T>::get;
+};
/* Generic/type-erased function pointer. */
template<typename T>
static erased_args erase_args (var_types var_type,
T *var,
- setting_setter_ftype<T> set_setting_func,
- setting_getter_ftype<T> get_setting_func)
+ typename setting_func_types<T>::set set_setting_func,
+ typename setting_func_types<T>::get get_setting_func)
{
gdb_assert (var_type_uses<T> (var_type));
/* The getter and the setter must be both provided or both omitted. */
Type T must match the var type VAR_TYPE (see VAR_TYPE_USES). */
template<typename T>
setting (var_types var_type,
- setting_setter_ftype<T> setter,
- setting_getter_ftype<T> getter)
+ typename setting_func_types<T>::set setter,
+ typename setting_func_types<T>::get getter)
: m_var_type (var_type)
{
gdb_assert (var_type_uses<T> (var_type));
The template parameter T is the type of the variable used to store the
setting. */
template<typename T>
- const T &get () const
+ typename setting_func_types<T>::type get () const
{
gdb_assert (var_type_uses<T> (m_var_type));
if (m_var == nullptr)
{
gdb_assert (m_getter != nullptr);
- auto getter = reinterpret_cast<setting_getter_ftype<T>> (m_getter);
+ auto getter = reinterpret_cast<typename setting_func_types<T>::get> (m_getter);
return getter ();
}
else
if (m_var == nullptr)
{
gdb_assert (m_setter != nullptr);
- auto setter = reinterpret_cast<setting_setter_ftype<T>> (m_setter);
+ auto setter = reinterpret_cast<typename setting_func_types<T>::set> (m_setter);
setter (v);
}
else
struct cli_suppress_notification
{
/* Inferior, thread, frame selected notification suppressed? */
- int user_selected_context;
+ bool user_selected_context = false;
+
+ /* Normal stop event suppressed? */
+ bool normal_stop = false;
};
extern struct cli_suppress_notification cli_suppress_notification;
(const char *name, enum command_class theclass,
cmd_simple_func_ftype *fun, const char *doc,
struct cmd_list_element **list,
- int *suppress_notification);
+ bool *suppress_notification);
extern struct cmd_list_element *add_alias_cmd (const char *,
cmd_list_element *,
const char *doc, struct cmd_list_element **subcommands,
int allow_unknown,
struct cmd_list_element **list,
- int *suppress_notification);
+ bool *suppress_notification);
extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *,
enum command_class,
extern struct cmd_list_element *add_com_suppress_notification
(const char *name, enum command_class theclass,
cmd_simple_func_ftype *fun, const char *doc,
- int *supress_notification);
+ bool *supress_notification);
extern struct cmd_list_element *add_info (const char *,
cmd_simple_func_ftype *fun,
extern set_show_commands add_setshow_enum_cmd
(const char *name, command_class theclass, const char *const *enumlist,
const char *set_doc, const char *show_doc,
- const char *help_doc, setting_setter_ftype<const char *> set_func,
- setting_getter_ftype<const char *> get_func, show_value_ftype *show_func,
+ const char *help_doc, setting_func_types<const char *>::set set_func,
+ setting_func_types<const char *>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_auto_boolean_cmd
extern set_show_commands add_setshow_auto_boolean_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<enum auto_boolean> set_func,
- setting_getter_ftype<enum auto_boolean> get_func,
+ setting_func_types<enum auto_boolean>::set set_func,
+ setting_func_types<enum auto_boolean>::get get_func,
show_value_ftype *show_func, cmd_list_element **set_list,
cmd_list_element **show_list);
extern set_show_commands add_setshow_boolean_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<bool> set_func,
- setting_getter_ftype<bool> get_func, show_value_ftype *show_func,
+ setting_func_types<bool>::set set_func,
+ setting_func_types<bool>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_filename_cmd
extern set_show_commands add_setshow_filename_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<std::string> set_func,
- setting_getter_ftype<std::string> get_func, show_value_ftype *show_func,
+ setting_func_types<std::string>::set set_func,
+ setting_func_types<std::string>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_string_cmd
extern set_show_commands add_setshow_string_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<std::string> set_func,
- setting_getter_ftype<std::string> get_func,
+ setting_func_types<std::string>::set set_func,
+ setting_func_types<std::string>::get get_func,
show_value_ftype *show_func, cmd_list_element **set_list,
cmd_list_element **show_list);
extern set_show_commands add_setshow_string_noescape_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<std::string> set_func,
- setting_getter_ftype<std::string> get_func, show_value_ftype *show_func,
+ setting_func_types<std::string>::set set_func,
+ setting_func_types<std::string>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_optional_filename_cmd
extern set_show_commands add_setshow_optional_filename_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<std::string> set_func,
- setting_getter_ftype<std::string> get_func,
+ setting_func_types<std::string>::set set_func,
+ setting_func_types<std::string>::get get_func,
show_value_ftype *show_func, cmd_list_element **set_list,
cmd_list_element **show_list);
extern set_show_commands add_setshow_integer_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<int> set_func,
- setting_getter_ftype<int> get_func, show_value_ftype *show_func,
+ setting_func_types<int>::set set_func,
+ setting_func_types<int>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_uinteger_cmd
extern set_show_commands add_setshow_uinteger_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<unsigned int> set_func,
- setting_getter_ftype<unsigned int> get_func, show_value_ftype *show_func,
+ setting_func_types<unsigned int>::set set_func,
+ setting_func_types<unsigned int>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_zinteger_cmd
extern set_show_commands add_setshow_zinteger_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<int> set_func,
- setting_getter_ftype<int> get_func, show_value_ftype *show_func,
+ setting_func_types<int>::set set_func,
+ setting_func_types<int>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_zuinteger_cmd
extern set_show_commands add_setshow_zuinteger_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<unsigned int> set_func,
- setting_getter_ftype<unsigned int> get_func, show_value_ftype *show_func,
+ setting_func_types<unsigned int>::set set_func,
+ setting_func_types<unsigned int>::get get_func, show_value_ftype *show_func,
cmd_list_element **set_list, cmd_list_element **show_list);
extern set_show_commands add_setshow_zuinteger_unlimited_cmd
extern set_show_commands add_setshow_zuinteger_unlimited_cmd
(const char *name, command_class theclass, const char *set_doc,
const char *show_doc, const char *help_doc,
- setting_setter_ftype<int> set_func, setting_getter_ftype<int> get_func,
+ setting_func_types<int>::set set_func, setting_func_types<int>::get get_func,
show_value_ftype *show_func, cmd_list_element **set_list,
cmd_list_element **show_list);