* printcmd.c (print_command_1): Annotate the top-level expressions

[deliverable/binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index c6e9b16de66b5c67388e05bd767c6ea651f53995..89a9eb25b32ffa431bd4c9f24dd4401ecdb91327 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -276,11 +276,23 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
            }
          else
            {
+             if (annotation_level > 1)
+               printf_filtered ("\n\032\032field-name-begin\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 (TYPE_FIELD_PACKED (type, i))
            {
              value_ptr v;
@@ -313,7 +325,10 @@ cp_print_value_fields (type, valaddr, stream, format, recurse, pretty,
                              0, stream, format, 0, recurse + 1, pretty);
                }
            }
+         if (annotation_level > 1)
+           printf_filtered ("\n\032\032field-end\n");
        }
+
       if (pretty)
        {
          fprintf_filtered (stream, "\n");