/* Output generating routines for GDB.
- Copyright (C) 1999-2017 Free Software Foundation, Inc.
+ Copyright (C) 1999-2018 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
ui_out_type_list
};
-extern struct cleanup *make_cleanup_ui_out_table_begin_end (struct ui_out *ui_out,
- int nr_cols,
- int nr_rows,
- const char *tblid);
-/* Compatibility wrappers. */
-
-extern struct cleanup *make_cleanup_ui_out_list_begin_end (struct ui_out *uiout,
- const char *id);
-
-extern struct cleanup *make_cleanup_ui_out_tuple_begin_end (struct ui_out *uiout,
- const char *id);
-
class ui_out
{
public:
void field_core_addr (const char *fldname, struct gdbarch *gdbarch,
CORE_ADDR address);
void field_string (const char *fldname, const char *string);
+ void field_string (const char *fldname, const std::string &string);
void field_stream (const char *fldname, string_file &stream);
void field_skip (const char *fldname);
void field_fmt (const char *fldname, const char *format, ...)
a hack to encapsulate that test. Once GDB manages to separate the
CLI/MI from the core of GDB the problem should just go away .... */
- bool is_mi_like_p ();
+ bool is_mi_like_p () const;
bool query_table_field (int colno, int *width, int *alignment,
const char **col_name);
/* Set as not MI-like by default. It is overridden in subclasses if
necessary. */
- virtual bool do_is_mi_like_p ()
+ virtual bool do_is_mi_like_p () const
{ return false; }
private:
m_uiout->end (Type);
}
- ui_out_emit_type (const ui_out_emit_type<Type> &) = delete;
- ui_out_emit_type<Type> &operator= (const ui_out_emit_type<Type> &)
- = delete;
+ DISABLE_COPY_AND_ASSIGN (ui_out_emit_type<Type>);
private:
typedef ui_out_emit_type<ui_out_type_tuple> ui_out_emit_tuple;
typedef ui_out_emit_type<ui_out_type_list> ui_out_emit_list;
-/* This is similar to make_cleanup_ui_out_table_begin_end, but written
- as an RAII class. */
+/* Start a new table on construction, and end the table on
+ destruction. */
class ui_out_emit_table
{
public:
struct ui_out *m_uiout;
};
+/* On destruction, pop the last redirection by calling the uiout's
+ redirect method with a NULL parameter. */
+class ui_out_redirect_pop
+{
+public:
+
+ ui_out_redirect_pop (ui_out *uiout)
+ : m_uiout (uiout)
+ {
+ }
+
+ ~ui_out_redirect_pop ()
+ {
+ m_uiout->redirect (NULL);
+ }
+
+ ui_out_redirect_pop (const ui_out_redirect_pop &) = delete;
+ ui_out_redirect_pop &operator= (const ui_out_redirect_pop &) = delete;
+
+private:
+ struct ui_out *m_uiout;
+};
+
#endif /* UI_OUT_H */