From: Simon Marchi Date: Mon, 4 Sep 2017 17:09:12 +0000 (+0200) Subject: Move command lines types/declarations to cli-script.h X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=6b66338c70422d670637623cea8dc3b62e05e7de;p=deliverable%2Fbinutils-gdb.git Move command lines types/declarations to cli-script.h I think it would make more sense if the types and function declarations related to command lines were in cli-script.h rather than defs.h, since the related function definitions are in cli-script.c. I had to add a few includes here and there. I also had to rename the "lines" parameter of command_lines_deleter::operator(), because ncurses has a "#define lines ..." that was interfering when cli-script.h is included by some TUI source files that also include ncurses header files. gdb/ChangeLog: * cli/cli-script.h (enum misc_command_type): Move from defs.h. (enum command_control_type): Likewise. (struct command_line): Likewise. (free_command_lines): Likewise. (struct command_lines_deleter): Likewise. (command_line_up): Likewise. (read_command_lines): Likewise. (read_command_lines_1): Likewise. * defs.h (enum misc_command_type): Move to cli/cli-script.h. (enum command_control_type): Likewise. (struct command_line): Likewise. (free_command_lines): Likewise. (struct command_lines_deleter): Likewise. (command_line_up): Likewise. (read_command_lines): Likewise. (read_command_lines_1): Likewise. * breakpoint.h: Include cli/cli-script.h. * extension-priv.h: Likewise. * gdbcmd.h: Likewise. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b4000b044..0a1171a953 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,25 @@ +2017-09-04 Simon Marchi + + * cli/cli-script.h (enum misc_command_type): Move from defs.h. + (enum command_control_type): Likewise. + (struct command_line): Likewise. + (free_command_lines): Likewise. + (struct command_lines_deleter): Likewise. + (command_line_up): Likewise. + (read_command_lines): Likewise. + (read_command_lines_1): Likewise. + * defs.h (enum misc_command_type): Move to cli/cli-script.h. + (enum command_control_type): Likewise. + (struct command_line): Likewise. + (free_command_lines): Likewise. + (struct command_lines_deleter): Likewise. + (command_line_up): Likewise. + (read_command_lines): Likewise. + (read_command_lines_1): Likewise. + * breakpoint.h: Include cli/cli-script.h. + * extension-priv.h: Likewise. + * gdbcmd.h: Likewise. + 2017-09-04 Pedro Alves * ada-lang.c (is_known_support_routine): Move sal declaration to diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index d0fa32404a..8b35eef286 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -29,6 +29,7 @@ #include "location.h" #include #include "common/array-view.h" +#include "cli/cli-script.h" struct value; struct block; diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h index 95149386c4..234faf7c0b 100644 --- a/gdb/cli/cli-script.h +++ b/gdb/cli/cli-script.h @@ -18,9 +18,83 @@ #define CLI_SCRIPT_H 1 struct ui_file; -struct command_line; struct cmd_list_element; +/* * Control types for commands. */ + +enum misc_command_type +{ + ok_command, + end_command, + else_command, + nop_command +}; + +enum command_control_type +{ + simple_control, + break_control, + continue_control, + while_control, + if_control, + commands_control, + python_control, + compile_control, + guile_control, + while_stepping_control, + invalid_control +}; + +/* * Structure for saved commands lines (for breakpoints, defined + commands, etc). */ + +struct command_line +{ + struct command_line *next; + char *line; + enum command_control_type control_type; + union + { + struct + { + enum compile_i_scope_types scope; + void *scope_data; + } + compile; + } + control_u; + /* * The number of elements in body_list. */ + int body_count; + /* * For composite commands, the nested lists of commands. For + example, for "if" command this will contain the then branch and + the else branch, if that is available. */ + struct command_line **body_list; +}; + +extern void free_command_lines (struct command_line **); + +/* A deleter for command_line that calls free_command_lines. */ + +struct command_lines_deleter +{ + void operator() (command_line *cmd_lines) const + { + free_command_lines (&cmd_lines); + } +}; + +/* A unique pointer to a command_line. */ + +typedef std::unique_ptr command_line_up; + +extern command_line_up read_command_lines (char *, int, int, + void (*)(char *, void *), + void *); +extern command_line_up read_command_lines_1 (char * (*) (void), int, + void (*)(char *, void *), + void *); + + /* Exported to cli/cli-cmds.c */ extern void script_from_file (FILE *stream, const char *file); diff --git a/gdb/defs.h b/gdb/defs.h index e180523a97..af9e32e532 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -400,80 +400,6 @@ enum lval_type lval_computed }; -/* * Control types for commands. */ - -enum misc_command_type - { - ok_command, - end_command, - else_command, - nop_command - }; - -enum command_control_type - { - simple_control, - break_control, - continue_control, - while_control, - if_control, - commands_control, - python_control, - compile_control, - guile_control, - while_stepping_control, - invalid_control - }; - -/* * Structure for saved commands lines (for breakpoints, defined - commands, etc). */ - -struct command_line - { - struct command_line *next; - char *line; - enum command_control_type control_type; - union - { - struct - { - enum compile_i_scope_types scope; - void *scope_data; - } - compile; - } - control_u; - /* * The number of elements in body_list. */ - int body_count; - /* * For composite commands, the nested lists of commands. For - example, for "if" command this will contain the then branch and - the else branch, if that is available. */ - struct command_line **body_list; - }; - -extern void free_command_lines (struct command_line **); - -/* A deleter for command_line that calls free_command_lines. */ - -struct command_lines_deleter -{ - void operator() (command_line *lines) const - { - free_command_lines (&lines); - } -}; - -/* A unique pointer to a command_line. */ - -typedef std::unique_ptr command_line_up; - -extern command_line_up read_command_lines (char *, int, int, - void (*)(char *, void *), - void *); -extern command_line_up read_command_lines_1 (char * (*) (void), int, - void (*)(char *, void *), - void *); - /* * Parameters of the "info proc" command. */ enum info_proc_what diff --git a/gdb/extension-priv.h b/gdb/extension-priv.h index f77f088ba8..4d16ac5062 100644 --- a/gdb/extension-priv.h +++ b/gdb/extension-priv.h @@ -23,6 +23,7 @@ #include "extension.h" #include +#include "cli/cli-script.h" /* The return code for some API calls. */ diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h index 14c7f4e541..3191ecd7fe 100644 --- a/gdb/gdbcmd.h +++ b/gdb/gdbcmd.h @@ -26,6 +26,7 @@ #include "command.h" #include "ui-out.h" +#include "cli/cli-script.h" /* Chain containing all defined commands. */