forked from Imagelibrary/binutils-gdb
b69d38afde
I didn't manage to usefully split this further into smaller
independent pieces, so:
- Use "struct buffer" more.
- Split out the responsibility of composing a complete command line
from multiple input lines split with backslash
(
E.g.:
(gdb) print \
1 + \
2
$1 = 3
(gdb)
)
to a separate function. Note we don't need the separate
readline_input_state and more_to_come globals at all. They were
just obfuscating the logic.
- Factor out the tricky mostly duplicated code in
command_line_handler and command_line_input.
gdb/ChangeLog
2016-03-09 Pedro Alves <palves@redhat.com>
* event-top.c (more_to_come): Delete.
(struct readline_input_state): Delete.
(readline_input_state): Delete.
(get_command_line_buffer): New function.
(command_handler): Update comments. Don't handle NULL commands
here. Do not execute commented lines.
(command_line_append_input_line): New function.
(handle_line_of_input): New function, partly based on
command_line_handler and command_line_input.
(command_line_handler): Rewrite.
* event-top.h (command_handler): New declaration.
(command_loop): Defer command execution to command_handler.
(command_line_input): Update comments. Simplify, using struct
buffer and handle_line_of_input.
* top.h (struct buffer): New forward declaration.
(handle_line_of_input): New declaration.
81 lines
2.7 KiB
C
81 lines
2.7 KiB
C
/* Definitions used by event-top.c, for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1999-2016 Free Software Foundation, Inc.
|
|
|
|
Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions.
|
|
|
|
This file is part of GDB.
|
|
|
|
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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef EVENT_TOP_H
|
|
#define EVENT_TOP_H
|
|
|
|
struct cmd_list_element;
|
|
|
|
/* Exported functions from event-top.c.
|
|
FIXME: these should really go into top.h. */
|
|
|
|
extern void display_gdb_prompt (const char *new_prompt);
|
|
void gdb_setup_readline (void);
|
|
void gdb_disable_readline (void);
|
|
extern void async_init_signals (void);
|
|
extern void set_async_editing_command (char *args, int from_tty,
|
|
struct cmd_list_element *c);
|
|
|
|
extern void command_handler (char *command);
|
|
|
|
/* Signal to catch ^Z typed while reading a command: SIGTSTP or SIGCONT. */
|
|
#ifndef STOP_SIGNAL
|
|
#include <signal.h>
|
|
#ifdef SIGTSTP
|
|
#define STOP_SIGNAL SIGTSTP
|
|
extern void handle_stop_sig (int sig);
|
|
#endif
|
|
#endif
|
|
extern void handle_sigint (int sig);
|
|
extern void handle_sigterm (int sig);
|
|
extern void async_request_quit (void *arg);
|
|
extern void stdin_event_handler (int error, void *client_data);
|
|
extern void async_disable_stdin (void);
|
|
extern void async_enable_stdin (void);
|
|
|
|
/* Exported variables from event-top.c.
|
|
FIXME: these should really go into top.h. */
|
|
|
|
extern int async_command_editing_p;
|
|
extern int exec_done_display_p;
|
|
extern struct prompts the_prompts;
|
|
extern void (*call_readline) (void *);
|
|
extern void (*input_handler) (char *);
|
|
extern int input_fd;
|
|
extern void (*after_char_processing_hook) (void);
|
|
extern int call_stdin_event_handler_again_p;
|
|
extern void gdb_readline_no_editing_callback (void *client_data);
|
|
|
|
/* Wrappers for rl_callback_handler_remove and
|
|
rl_callback_handler_install that keep track of whether the callback
|
|
handler is installed in readline. Do not call the readline
|
|
versions directly. */
|
|
extern void gdb_rl_callback_handler_remove (void);
|
|
extern void gdb_rl_callback_handler_install (const char *prompt);
|
|
|
|
/* Reinstall the readline callback handler (with no prompt), if not
|
|
currently installed. */
|
|
extern void gdb_rl_callback_handler_reinstall (void);
|
|
|
|
extern void cli_command_loop (void *);
|
|
|
|
#endif
|