Use raw strings on gdb.python/py-xmethods.exp (and fix Python 3.8's "SyntaxWarning...

[external/binutils.git] / gdb / cli-out.c

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index e1005e1..549d518 100644 (file)
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -1,6 +1,6 @@
 /* Output generating routines for GDB CLI.
 
-   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+   Copyright (C) 1999-2019 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
@@ -93,15 +93,26 @@ cli_ui_out::do_end (ui_out_type type)
 /* output an int field */
 
 void
-cli_ui_out::do_field_int (int fldno, int width, ui_align alignment,
-                         const char *fldname, int value)
+cli_ui_out::do_field_signed (int fldno, int width, ui_align alignment,
+                            const char *fldname, LONGEST value)
 {
   if (m_suppress_output)
     return;
 
-  std::string str = string_printf ("%d", value);
+  do_field_string (fldno, width, alignment, fldname, plongest (value),
+                  ui_out_style_kind::DEFAULT);
+}
+
+/* output an unsigned field */
+
+void
+cli_ui_out::do_field_unsigned (int fldno, int width, ui_align alignment,
+                              const char *fldname, ULONGEST value)
+{
+  if (m_suppress_output)
+    return;
 
-  do_field_string (fldno, width, alignment, fldname, str.c_str (),
+  do_field_string (fldno, width, alignment, fldname, pulongest (value),
                   ui_out_style_kind::DEFAULT);
 }
 
@@ -176,6 +187,9 @@ cli_ui_out::do_field_string (int fldno, int width, ui_align align,
        case ui_out_style_kind::VARIABLE:
          fstyle = variable_name_style.style ();
          break;
+       case ui_out_style_kind::ADDRESS:
+         fstyle = address_style.style ();
+         break;
        default:
          gdb_assert_not_reached ("missing case");
        }
@@ -302,6 +316,12 @@ cli_ui_out::set_stream (struct ui_file *stream)
   return old;
 }
 
+bool
+cli_ui_out::can_emit_style_escape () const
+{
+  return m_streams.back ()->can_emit_style_escape ();
+}
+
 /* CLI interface to display tab-completion matches.  */
 
 /* CLI version of displayer.crlf.  */