OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* cli/cli-script.c (process_next_line): Recognize 'end' 

even when the line has leading space and we're not parsing
	commands.
This commit is contained in:
Vladimir Prus 2009-11-18 20:42:38 +00:00
parent f0ae4a24b0
commit 3630a92dd7
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-18 Vladimir Prus <vladimir@codesourcery.com>
* cli/cli-script.c (process_next_line): Recognize 'end'
even when the line has leading space and we're not parsing
commands.
2009-11-18 Tom Tromey <tromey@redhat.com>
* symtab.c (symbol_set_names): Correctly set 'name' on symbol when

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

@ -879,30 +879,35 @@ static enum misc_command_type
process_next_line (char *p, struct command_line **command, int parse_commands)
{
char *p1;
char *p2;
int not_handled = 0;
/* Not sure what to do here. */
if (p == NULL)
return end_command;
if (parse_commands)
{
/* Strip leading whitespace. */
while (*p == ' ' || *p == '\t')
p++;
}
/* Strip trailing whitespace. */
p1 = p + strlen (p);
while (p1 != p && (p1[-1] == ' ' || p1[-1] == '\t'))
p1--;
/* Is this the end of a simple, while, or if control structure? */
if (p1 - p == 3 && !strncmp (p, "end", 3))
return end_command;
p2 = p;
/* Strip leading whitespace. */
while (*p2 == ' ' || *p2 == '\t')
p2++;
/* 'end' is always recognized, regardless of parse_commands value.
We also permit whitespace before end and after. */
if (p1 - p2 == 3 && !strncmp (p2, "end", 3))
return end_command;
if (parse_commands)
{
/* If commands are parsed, we skip initial spaces. Otherwise,
which is the case for Python commands and documentation
(see the 'document' command), spaces are preserved. */
p = p2;
/* Blanks and comments don't really do anything, but we need to
distinguish them from else, end and other commands which can be
executed. */