mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-23 13:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

cli/cli-script.c (multi_line_command_p): New function.

Browse Source 
* cli/cli-script.c (multi_line_command_p): New function.
	(recurse_read_control_structure, read_command_lines_1): Call it.
	(execute_control_command): Consistently have a blank line between
	each case.
This commit is contained in:
Doug Evans 2013-11-23 11:47:24 -08:00
parent 9df9dbe031
commit 1e9c71b81b
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2013-11-23 Doug Evans <xdje42@gmail.com>
* cli/cli-script.c (multi_line_command_p): New function.
(recurse_read_control_structure, read_command_lines_1): Call it.
(execute_control_command): Consistently have a blank line between
each case.
2013-11-22 Sterling Augustine <saugustine@google.com>
PR gdb/16196:

39
gdb/cli/cli-script.c
View File

@ -78,6 +78,25 @@ struct user_args
*user_args;
/* Return non-zero if TYPE is a multi-line command (i.e., is terminated
by "end"). */
static int
multi_line_command_p (enum command_control_type type)
{
switch (type)
{
case if_control:
case while_control:
case while_stepping_control:
case commands_control:
case python_control:
return 1;
default:
return 0;
}
}
/* Allocate, initialize a new command line structure for one of the
control commands (if/while). */
@ -556,6 +575,7 @@ execute_control_command (struct command_line *cmd)
break;
}
case commands_control:
{
/* Breakpoint commands list, record the commands in the
@ -567,6 +587,7 @@ execute_control_command (struct command_line *cmd)
ret = commands_from_control_command (new_line, cmd);
break;
}
case python_control:
{
eval_python_from_control_command (cmd);
@ -1103,11 +1124,7 @@ recurse_read_control_structure (char * (*read_next_line_func) (void),
if (val == end_command)
{
if (current_cmd->control_type == while_control
|| current_cmd->control_type == while_stepping_control
|| current_cmd->control_type == if_control
|| current_cmd->control_type == python_control
|| current_cmd->control_type == commands_control)
if (multi_line_command_p (current_cmd->control_type))
{
/* Success reading an entire canned sequence of commands. */
ret = simple_control;
@ -1156,11 +1173,7 @@ recurse_read_control_structure (char * (*read_next_line_func) (void),
/* If the latest line is another control structure, then recurse
on it. */
if (next->control_type == while_control
|| next->control_type == while_stepping_control
|| next->control_type == if_control
|| next->control_type == python_control
|| next->control_type == commands_control)
if (multi_line_command_p (next->control_type))
{
control_level++;
ret = recurse_read_control_structure (read_next_line_func, next,
@ -1275,11 +1288,7 @@ read_command_lines_1 (char * (*read_next_line_func) (void), int parse_commands,
break;
}
if (next->control_type == while_control
|| next->control_type == if_control
|| next->control_type == python_control
|| next->control_type == commands_control
|| next->control_type == while_stepping_control)
if (multi_line_command_p (next->control_type))
{
control_level++;
ret = recurse_read_control_structure (read_next_line_func, next,