diff options
| author | Jackie Smith Cashion <jsmith@redhat.com> | 2001-12-13 22:42:23 +0000 |
|---|---|---|
| committer | Jackie Smith Cashion <jsmith@redhat.com> | 2001-12-13 22:42:23 +0000 |
| commit | e6ccd35f61cf792f387329dae86cadbcbee25049 (patch) | |
| tree | 8d1eb937940ef4638d5463eea599e57221f9ad2a /gdb | |
| parent | 5d003c95923bce6c630e7c37873d667d0c273d0f (diff) | |
| download | gdb-e6ccd35f61cf792f387329dae86cadbcbee25049.zip gdb-e6ccd35f61cf792f387329dae86cadbcbee25049.tar.gz gdb-e6ccd35f61cf792f387329dae86cadbcbee25049.tar.bz2 | |
gdb/ChangeLog
2001-12-13 Jackie Smith Cashion <jsmith@redhat.com>
* cli/cli-script.c (print_command_lines): Remove extra
"if", "else", "while", and "end" from show user output.
testsuite/ChangeLog
2001-12-13 Jackie Smith Cashion <jsmith@redhat.com>
* gdb.base/commands.exp (user_defined_command_test): Make "show user"
test expect string more specific.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 12 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/commands.exp | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ea3b1b..601a84a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 Jackie Smith Cashion <jsmith@redhat.com> + + * cli/cli-script.c (print_command_lines): Remove extra + "if", "else", "while", and "end" from show user output. + 2001-12-13 Kevin Buettner <kevinb@redhat.com> * i387-nat.c (i387_fill_fxsave): Change type of ``val'' from char diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 69fc4fb..3fb49f1 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -171,14 +171,13 @@ print_command_lines (struct ui_out *uiout, struct command_line *cmd, /* A while command. Recursively print its subcommands and continue. */ if (list->control_type == while_control) { - ui_out_text (uiout, "while "); ui_out_field_fmt (uiout, NULL, "while %s", list->line); ui_out_text (uiout, "\n"); print_command_lines (uiout, *list->body_list, depth + 1); - ui_out_field_string (uiout, NULL, "end"); if (depth) ui_out_spaces (uiout, 2 * depth); - ui_out_text (uiout, "end\n"); + ui_out_field_string (uiout, NULL, "end"); + ui_out_text (uiout, "\n"); list = list->next; continue; } @@ -186,7 +185,6 @@ print_command_lines (struct ui_out *uiout, struct command_line *cmd, /* An if command. Recursively print both arms before continueing. */ if (list->control_type == if_control) { - ui_out_text (uiout, "if "); ui_out_field_fmt (uiout, NULL, "if %s", list->line); ui_out_text (uiout, "\n"); /* The true arm. */ @@ -198,14 +196,14 @@ print_command_lines (struct ui_out *uiout, struct command_line *cmd, if (depth) ui_out_spaces (uiout, 2 * depth); ui_out_field_string (uiout, NULL, "else"); - ui_out_text (uiout, "else\n"); + ui_out_text (uiout, "\n"); print_command_lines (uiout, list->body_list[1], depth + 1); } - ui_out_field_string (uiout, NULL, "end"); if (depth) ui_out_spaces (uiout, 2 * depth); - ui_out_text (uiout, "end\n"); + ui_out_field_string (uiout, NULL, "end"); + ui_out_text (uiout, "\n"); list = list->next; continue; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6d0c4f8..f464ab4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 Jackie Smith Cashion <jsmith@redhat.com> + + * gdb.base/commands.exp (user_defined_command_test): Make "show user" + test expect string more specific. + 2001-12-13 Corinna Vinschen <vinschen@redhat.com> * gdb.asm/asm-source.exp: Add support for xstormy16. diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 266948c..dfaf965 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -261,7 +261,7 @@ proc user_defined_command_test {} { "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \ "execute user defined command in user_defined_command_test" gdb_test "show user mycommand" \ - "while.*set.*if.*p/x.*else.*p/x.*end.*" \ + " while \\\$arg0.*set.* if \\\(\\\$arg0.*p/x.* else\[^\n\].*p/x.* end\[^\n\].* end\[^\n\].*" \ "display user command in user_defined_command_test" } |