aboutsummaryrefslogtreecommitdiff
path: root/gdb/defs.h
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-09-04 19:09:12 +0200
committerSimon Marchi <simon.marchi@ericsson.com>2017-09-04 19:09:12 +0200
commit6b66338c70422d670637623cea8dc3b62e05e7de (patch)
treea3f23024b461aa4680ba4841847067dfd00be298 /gdb/defs.h
parent50a421ac3ad82886afb0916b112ddeac4f9f73dc (diff)
downloadgdb-6b66338c70422d670637623cea8dc3b62e05e7de.zip
gdb-6b66338c70422d670637623cea8dc3b62e05e7de.tar.gz
gdb-6b66338c70422d670637623cea8dc3b62e05e7de.tar.bz2
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.
Diffstat (limited to 'gdb/defs.h')
-rw-r--r--gdb/defs.h74
1 files changed, 0 insertions, 74 deletions
diff --git a/gdb/defs.h b/gdb/defs.h
index e180523..af9e32e 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, command_lines_deleter> 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