aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Prus <vladimir@codesourcery.com>2009-11-18 20:42:38 +0000
committerVladimir Prus <vladimir@codesourcery.com>2009-11-18 20:42:38 +0000
commit3630a92dd7470ee125e5b59dc16c977c2d76a858 (patch)
treeeb3883fbb86336d4bfe17bfc1ac8aa5fd132e441
parentf0ae4a24b0ae1649cc3a835ba0dd407c0bd8dc56 (diff)
downloadgdb-3630a92dd7470ee125e5b59dc16c977c2d76a858.zip
gdb-3630a92dd7470ee125e5b59dc16c977c2d76a858.tar.gz
gdb-3630a92dd7470ee125e5b59dc16c977c2d76a858.tar.bz2
* cli/cli-script.c (process_next_line): Recognize 'end'
even when the line has leading space and we're not parsing commands.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/cli/cli-script.c25
2 files changed, 21 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 494e78e..ecabb6c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 6e90bf2..0f8f393 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -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. */