* utils.c (prompt_for_continue): Annotate prompt.

	(query): Annotate query.
	* printcmd.c (print_frame_args): Change syntax of argument
	annotation to make name and value part of a single group of
	annotations, not two separate groups.
	* cp-valprint.c (cp_print_value_fields): Likewise for fields.
	* valprint.c (val_print_array_elements): Change syntax of
	annotation to be more concise.
	* main.c, defs.h (command_line_input): New argument tells what
	string to include in the annotations.
	* symtab.c (decode_line_2), main.c (read_command_lines,
	command_loop): Change callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b59624b..41ee581 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,18 @@
 Thu Apr 21 07:45:49 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * utils.c (prompt_for_continue): Annotate prompt.
+       (query): Annotate query.
+       * printcmd.c (print_frame_args): Change syntax of argument
+       annotation to make name and value part of a single group of
+       annotations, not two separate groups.
+       * cp-valprint.c (cp_print_value_fields): Likewise for fields.
+       * valprint.c (val_print_array_elements): Change syntax of
+       annotation to be more concise.
+       * main.c, defs.h (command_line_input): New argument tells what
+       string to include in the annotations.
+       * symtab.c (decode_line_2), main.c (read_command_lines,
+       command_loop): Change callers.
+
        * breakpoint.c (watch_command): Use (CORE_ADDR)0, not NULL, for
        target null pointer.
        * blockframe.c (find_frame_addr_in_frame_chain): Likewise.

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 89a9eb2..0346c03 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -277,20 +277,20 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
          else
            {
              if (annotation_level > 1)
-               printf_filtered ("\n\032\032field-name-begin\n");
+               {
+                 printf_filtered ("\n\032\032field-begin ");
+                 print_value_flags (TYPE_FIELD_TYPE (type, i));
+                 printf_filtered ("\n");
+               }
+
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
                                       language_cplus,
                                       DMGL_PARAMS | DMGL_ANSI);
              if (annotation_level > 1)
                printf_filtered ("\n\032\032field-name-end\n");
              fputs_filtered (" = ", stream);
-           }
-
-         if (annotation_level > 1)
-           {
-             printf_filtered ("\n\032\032field-begin ");
-             print_value_flags (TYPE_FIELD_TYPE (type, i));
-             printf_filtered ("\n");
+             if (annotation_level > 1)
+               printf_filtered ("\n\032\032field-value\n");
            }
 
          if (TYPE_FIELD_PACKED (type, i))