* expprint.c (dump_raw_expression): Print note if non-NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abaa78a2993b07f5f4a3bbb74627e14db7fbcf9a..44edfebd3f3e51213ffed611bb7d2ace0c0fc533 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2009-03-18  Doug Evans  <dje@google.com>
 
+       * expprint.c (dump_raw_expression): Print note if non-NULL.
+
        * printcmd.c (display_uses_solib_p): Redo loop, scan element list
        backwards.
 

diff --git a/gdb/expprint.c b/gdb/expprint.c
index 89bae03bade26f731d6d0f12ea4c1e3c56efcd0a..d7fac86c6762d6d4323d5b7fbb123d528856a957 100644 (file)
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -802,6 +802,9 @@ op_name_standard (enum exp_opcode opcode)
     }
 }
 
+/* Print a raw dump of expression EXP to STREAM.
+   NOTE, if non-NULL, is printed as extra explanatory text.  */
+
 void
 dump_raw_expression (struct expression *exp, struct ui_file *stream,
                     char *note)
@@ -813,7 +816,9 @@ dump_raw_expression (struct expression *exp, struct ui_file *stream,
 
   fprintf_filtered (stream, "Dump of expression @ ");
   gdb_print_host_address (exp, stream);
-  fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",
+  if (note)
+    fprintf_filtered (stream, ", %s:", note);
+  fprintf_filtered (stream, "\n\tLanguage %s, %d elements, %ld bytes each.\n",
                    exp->language_defn->la_name, exp->nelts,
                    (long) sizeof (union exp_element));
   fprintf_filtered (stream, "\t%5s  %20s  %16s  %s\n", "Index", "Opcode",