From d6f9b0fbc7998909712cbc1b194f1cbd4ae8b6fa Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 3 Feb 2017 16:30:04 +0000 Subject: C++-fy struct interp/cli_interp/tui_interp/mi_interp - The interp->data field disappears, since we can put data in the interpreter directly now. The "init" method remains in place, but it now returns void. - A few places check if the interpreter method is NULL before calling it, and also check whether the method returns true/false. For some of those methods, all current implementations always return true. In those cases, this commit makes the C++-fied method return void instead and cleans up the callers. Tested on x86_64 Fedora 23. gdb/ChangeLog: 2017-02-03 Pedro Alves * cli/cli-interp.c (cli_interp_base::cli_interp_base) (cli_interp_base::~cli_interp_base): New. (cli_interp): New struct. (as_cli_interp): Cast the interp itself to cli_interp. (cli_interpreter_pre_command_loop): Rename to ... (cli_interp_base::pre_command_loop): ... this. Remove 'self' parameter. (cli_interpreter_init): Rename to ... (cli_interp::init): ... this. Remove 'self' parameter. Use boolean. Make extern. (cli_interpreter_resume): Rename to ... (cli_interp::resume): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_suspend): Rename to ... (cli_interp::suspend): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_exec): Rename to ... (cli_interp::exec): ... this. Remove 'data' parameter. Make extern. (cli_interpreter_supports_command_editing): Rename to ... (cli_interp_base::supports_command_editing): ... this. Remove 'interp' parameter. Make extern. (cli_ui_out): Rename to ... (cli_interp::interp_ui_out): ... this. Remove 'interp' parameter. Make extern. (cli_set_logging): Rename to ... (cli_interp_base::set_logging): ... this. Remove 'interp' parameter. Make extern. (cli_interp_procs): Delete. (cli_interp_factory): Adjust to use "new". * cli/cli-interp.h: Include "interps.h". (struct cli_interp_base): New struct. * interps.c (struct interp): Delete. Fields moved to interps.h. (interp_new): Delete. (interp::interp, interp::~interp): New. (interp_set): Use bool, and return void. Assume the interpreter has suspend, init and resume methods, and that the all return void. (set_top_level_interpreter): interp_set returns void. (interp_ui_out): Adapt. (current_interp_set_logging): Adapt. (interp_data): Delete. (interp_pre_command_loop, interp_supports_command_editing): Adapt. (interp_exec): Adapt. (top_level_interpreter_data): Delete. * interps.h (interp_init_ftype, interp_resume_ftype) (interp_suspend_ftype, interp_exec_ftype) (interp_pre_command_loop_ftype, interp_ui_out_ftype): Delete. (class interp): New. (interp_new): Delete. (interp_set): Now returns void. Use bool. (interp_data, top_level_interpreter_data): Delete. * mi/mi-common.h: Include interps.h. (class mi_interp): Inherit from interp. Define a ctor. Declare init, resume, suspect, exec, interp_ui_out, set_logging and pre_command_loop methods. * mi/mi-interp.c (as_mi_interp): Cast the interp itself. (mi_interpreter_init): Rename to ... (mi_interp::init): ... this. Remove the 'interp' parameter, use bool, return void and make extern. Adjust. (mi_interpreter_resume): ... Rename to ... (mi_interp::resume): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (mi_interpreter_suspend): ... Rename to ... (mi_interp::suspend): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (mi_interpreter_exec): ... Rename to ... (mi_interp::exec): ... this. Remove the 'data' parameter and make extern. Adjust. (mi_interpreter_pre_command_loop): ... Rename to ... (mi_interp::pre_command_loop): ... this. Remove the 'self' parameter and make extern. (mi_on_normal_stop_1): Adjust. (mi_ui_out): Rename to ... (mi_interp::interp_ui_out): ... this. Remove the 'interp' parameter and make extern. Adjust. (mi_set_logging): Rename to ... (mi_interp::set_logging): ... this. Remove the 'interp' parameter and make extern. Adjust. (mi_interp_procs): Delete. (mi_interp_factory): Adjust to use 'new'. * mi/mi-main.c (mi_cmd_gdb_exit, captured_mi_execute_command) (mi_print_exception, mi_execute_command, mi_load_progress): Adjust. * tui/tui-interp.c (tui_interp): New class. (as_tui_interp): Return a tui_interp pointer. (tui_on_normal_stop, tui_on_signal_received) (tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited) (tui_on_no_history, tui_on_user_selected_context_changed): Adjust to use interp::interp_ui_out. (tui_init): Rename to ... (tui_interp::init): ... this. Remove the 'self' parameter, use bool, return void and make extern. Adjust. (tui_resume): Rename to ... (tui_interp::resume): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (tui_suspend): Rename to ... (tui_interp::suspend): ... this. Remove the 'data' parameter, return void and make extern. Adjust. (tui_ui_out): Rename to ... (tui_interp::interp_ui_out): ... this. Remove the 'self' parameter, and make extern. Adjust. (tui_exec): Rename to ... (tui_interp::exec): ... this. Remove the 'data' parameter and make extern. (tui_interp_procs): Delete. (tui_interp_factory): Use "new". --- gdb/interps.h | 58 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'gdb/interps.h') diff --git a/gdb/interps.h b/gdb/interps.h index ef2ceeb..e564980 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -41,53 +41,57 @@ extern struct gdb_exception interp_exec (struct interp *interp, const char *command); extern int interp_quiet_p (struct interp *interp); -typedef void *(interp_init_ftype) (struct interp *self, int top_level); -typedef int (interp_resume_ftype) (void *data); -typedef int (interp_suspend_ftype) (void *data); -typedef struct gdb_exception (interp_exec_ftype) (void *data, - const char *command); -typedef void (interp_pre_command_loop_ftype) (struct interp *self); -typedef struct ui_out *(interp_ui_out_ftype) (struct interp *self); +class interp +{ +public: + explicit interp (const char *name); + virtual ~interp () = 0; -typedef void (interp_set_logging_ftype) (struct interp *self, - ui_file_up logfile, - bool logging_redirect); + virtual void init (bool top_level) + {} -typedef int (interp_supports_command_editing_ftype) (struct interp *self); + virtual void resume () = 0; + virtual void suspend () = 0; -struct interp_procs -{ - interp_init_ftype *init_proc; - interp_resume_ftype *resume_proc; - interp_suspend_ftype *suspend_proc; - interp_exec_ftype *exec_proc; + virtual gdb_exception exec (const char *command) = 0; /* Returns the ui_out currently used to collect results for this interpreter. It can be a formatter for stdout, as is the case for the console & mi outputs, or it might be a result formatter. */ - interp_ui_out_ftype *ui_out_proc; + virtual ui_out *interp_ui_out () = 0; /* Provides a hook for interpreters to do any additional setup/cleanup that they might need when logging is enabled or disabled. */ - interp_set_logging_ftype *set_logging_proc; + virtual void set_logging (ui_file_up logfile, bool logging_redirect) = 0; /* Called before starting an event loop, to give the interpreter a chance to e.g., print a prompt. */ - interp_pre_command_loop_ftype *pre_command_loop_proc; + virtual void pre_command_loop () + {} /* Returns true if this interpreter supports using the readline library; false if it uses GDB's own simplified readline emulation. */ - interp_supports_command_editing_ftype *supports_command_editing_proc; + virtual bool supports_command_editing () + { return false; } + + /* This is the name in "-i=" and "set interpreter". */ + const char *name; + + /* Interpreters are stored in a linked list, this is the next + one... */ + struct interp *next; + + /* Has the init method been run? */ + bool inited; + + bool quiet_p; }; -extern struct interp *interp_new (const char *name, - const struct interp_procs *procs, - void *data); extern void interp_add (struct ui *ui, struct interp *interp); -extern int interp_set (struct interp *interp, int top_level); +extern void interp_set (struct interp *interp, bool top_level); /* Look up the interpreter for NAME, creating one if none exists yet. If NAME is not a interpreter type previously registered with @@ -101,7 +105,6 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name); extern void set_top_level_interpreter (const char *name); extern struct ui_out *interp_ui_out (struct interp *interp); -extern void *interp_data (struct interp *interp); extern const char *interp_name (struct interp *interp); extern struct interp *interp_set_temp (const char *name); @@ -119,8 +122,7 @@ extern int current_interp_named_p (const char *name); extern void current_interp_set_logging (ui_file_up logfile, bool logging_redirect); -/* Returns opaque data associated with the top-level interpreter. */ -extern void *top_level_interpreter_data (void); +/* Returns the top-level interpreter. */ extern struct interp *top_level_interpreter (void); /* Return the current UI's current interpreter. */ -- cgit v1.1