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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ea3b1b990b614d8e2bc0d3270d5b2ac8e5df262..601a84ab3f0a89bc5fa5856685513d3ed8fa7ff3 100644 (file)
--- 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 69fc4fb31aefdbaf7ac7212693be611d0acc37ad..3fb49f173b92943469d3a905509b2af6819ad4d7 100644 (file)
--- 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 6d0c4f85997f60cb308bda35cbccce6fb8197ad1..f464ab4a10749aa231d4ab5c8a1e4d73b29e076b 100644 (file)
--- 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 266948c7803246ba442ec38b151841917170ba53..dfaf965ca9978446d906831495e06e65cdcae320 100644 (file)
--- 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"
 }