/* MI Command Set - output generating routines.
- Copyright (C) 2000-2014 Free Software Foundation, Inc.
+ Copyright (C) 2000-2016 Free Software Foundation, Inc.
Contributed by Cygnus Solutions (a Red Hat company).
#include "defs.h"
#include "ui-out.h"
#include "mi-out.h"
+#include <vector>
-struct ui_out_data
+struct mi_ui_out_data
{
int suppress_field_separator;
- int suppress_output;
int mi_version;
- struct ui_file *buffer;
- struct ui_file *original_buffer;
+ std::vector<ui_file *> streams;
};
-typedef struct ui_out_data mi_out_data;
+typedef struct mi_ui_out_data mi_out_data;
/* These are the MI output functions */
+static void mi_out_data_dtor (struct ui_out *ui_out);
static void mi_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows, const char *tblid);
static void mi_table_body (struct ui_out *uiout);
static void mi_table_end (struct ui_out *uiout);
static void mi_table_header (struct ui_out *uiout, int width,
- enum ui_align alig, const char *col_name,
- const char *colhdr);
+ enum ui_align alignment,
+ const std::string &col_name,
+ const std::string &col_hdr);
static void mi_begin (struct ui_out *uiout, enum ui_out_type type,
- int level, const char *id);
-static void mi_end (struct ui_out *uiout, enum ui_out_type type, int level);
+ const char *id);
+static void mi_end (struct ui_out *uiout, enum ui_out_type type);
static void mi_field_int (struct ui_out *uiout, int fldno, int width,
enum ui_align alig, const char *fldname, int value);
static void mi_field_skip (struct ui_out *uiout, int fldno, int width,
va_list args) ATTRIBUTE_PRINTF (6, 0);
static void mi_spaces (struct ui_out *uiout, int numspaces);
static void mi_text (struct ui_out *uiout, const char *string);
-static void mi_message (struct ui_out *uiout, int verbosity,
- const char *format, va_list args)
- ATTRIBUTE_PRINTF (3, 0);
-static void mi_wrap_hint (struct ui_out *uiout, char *identstring);
+static void mi_message (struct ui_out *uiout, const char *format, va_list args)
+ ATTRIBUTE_PRINTF (2, 0);
+static void mi_wrap_hint (struct ui_out *uiout, const char *identstring);
static void mi_flush (struct ui_out *uiout);
static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
mi_wrap_hint,
mi_flush,
mi_redirect,
- 0,
+ mi_out_data_dtor,
1, /* Needs MI hacks. */
};
/* Prototypes for local functions */
-extern void _initialize_mi_out (void);
static void field_separator (struct ui_out *uiout);
static void mi_open (struct ui_out *uiout, const char *name,
enum ui_out_type type);
const char *tblid)
{
mi_open (uiout, tblid, ui_out_type_tuple);
- mi_field_int (uiout, -1, -1, -1, "nr_rows", nr_rows);
- mi_field_int (uiout, -1, -1, -1, "nr_cols", nr_cols);
+ mi_field_int (uiout, -1, -1, ui_left, "nr_rows", nr_rows);
+ mi_field_int (uiout, -1, -1, ui_left, "nr_cols", nr_cols);
mi_open (uiout, "hdr", ui_out_type_list);
}
void
mi_table_body (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
- if (data->suppress_output)
- return;
/* close the table header line if there were any headers */
mi_close (uiout, ui_out_type_list);
mi_open (uiout, "body", ui_out_type_list);
void
mi_table_end (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
- data->suppress_output = 0;
mi_close (uiout, ui_out_type_list); /* body */
mi_close (uiout, ui_out_type_tuple);
}
void
mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
- const char *col_name, const char *colhdr)
+ const std::string &col_name, const std::string &col_hdr)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
mi_open (uiout, NULL, ui_out_type_tuple);
- mi_field_int (uiout, 0, 0, 0, "width", width);
- mi_field_int (uiout, 0, 0, 0, "alignment", alignment);
- mi_field_string (uiout, 0, 0, 0, "col_name", col_name);
- mi_field_string (uiout, 0, width, alignment, "colhdr", colhdr);
+ mi_field_int (uiout, 0, 0, ui_center, "width", width);
+ mi_field_int (uiout, 0, 0, ui_center, "alignment", alignment);
+ mi_field_string (uiout, 0, 0, ui_center, "col_name", col_name.c_str ());
+ mi_field_string (uiout, 0, width, alignment, "colhdr", col_hdr.c_str ());
mi_close (uiout, ui_out_type_tuple);
}
/* Mark beginning of a list. */
void
-mi_begin (struct ui_out *uiout, enum ui_out_type type, int level,
- const char *id)
+mi_begin (struct ui_out *uiout, enum ui_out_type type, const char *id)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
mi_open (uiout, id, type);
}
/* Mark end of a list. */
void
-mi_end (struct ui_out *uiout, enum ui_out_type type, int level)
+mi_end (struct ui_out *uiout, enum ui_out_type type)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
mi_close (uiout, type);
}
enum ui_align alignment, const char *fldname, int value)
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
xsnprintf (buffer, sizeof (buffer), "%d", value);
mi_field_string (uiout, fldno, width, alignment, fldname, buffer);
mi_field_string (struct ui_out *uiout, int fldno, int width,
enum ui_align align, const char *fldname, const char *string)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ struct ui_file *stream;
+ stream = data->streams.back ();
field_separator (uiout);
if (fldname)
- fprintf_unfiltered (data->buffer, "%s=", fldname);
- fprintf_unfiltered (data->buffer, "\"");
+ fprintf_unfiltered (stream, "%s=", fldname);
+ fprintf_unfiltered (stream, "\"");
if (string)
- fputstr_unfiltered (string, '"', data->buffer);
- fprintf_unfiltered (data->buffer, "\"");
+ fputstr_unfiltered (string, '"', stream);
+ fprintf_unfiltered (stream, "\"");
}
/* This is the only field function that does not align. */
enum ui_align align, const char *fldname,
const char *format, va_list args)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ struct ui_file *stream;
+ stream = data->streams.back ();
field_separator (uiout);
if (fldname)
- fprintf_unfiltered (data->buffer, "%s=\"", fldname);
+ fprintf_unfiltered (stream, "%s=\"", fldname);
else
- fputs_unfiltered ("\"", data->buffer);
- vfprintf_unfiltered (data->buffer, format, args);
- fputs_unfiltered ("\"", data->buffer);
+ fputs_unfiltered ("\"", stream);
+ vfprintf_unfiltered (stream, format, args);
+ fputs_unfiltered ("\"", stream);
}
void
}
void
-mi_message (struct ui_out *uiout, int verbosity,
- const char *format, va_list args)
+mi_message (struct ui_out *uiout, const char *format, va_list args)
{
}
void
-mi_wrap_hint (struct ui_out *uiout, char *identstring)
+mi_wrap_hint (struct ui_out *uiout, const char *identstring)
{
wrap_here (identstring);
}
void
mi_flush (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ struct ui_file *stream = data->streams.back ();
- gdb_flush (data->buffer);
+ gdb_flush (stream);
}
int
mi_redirect (struct ui_out *uiout, struct ui_file *outstream)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
if (outstream != NULL)
- {
- data->original_buffer = data->buffer;
- data->buffer = outstream;
- }
- else if (data->original_buffer != NULL)
- {
- data->buffer = data->original_buffer;
- data->original_buffer = NULL;
- }
+ data->streams.push_back (outstream);
+ else
+ data->streams.pop_back ();
return 0;
}
static void
field_separator (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ ui_file *stream = data->streams.back ();
if (data->suppress_field_separator)
data->suppress_field_separator = 0;
else
- fputc_unfiltered (',', data->buffer);
+ fputc_unfiltered (',', stream);
}
static void
mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ ui_file *stream = data->streams.back ();
field_separator (uiout);
data->suppress_field_separator = 1;
if (name)
- fprintf_unfiltered (data->buffer, "%s=", name);
+ fprintf_unfiltered (stream, "%s=", name);
switch (type)
{
case ui_out_type_tuple:
- fputc_unfiltered ('{', data->buffer);
+ fputc_unfiltered ('{', stream);
break;
case ui_out_type_list:
- fputc_unfiltered ('[', data->buffer);
+ fputc_unfiltered ('[', stream);
break;
default:
internal_error (__FILE__, __LINE__, _("bad switch"));
static void
mi_close (struct ui_out *uiout, enum ui_out_type type)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ ui_file *stream = data->streams.back ();
switch (type)
{
case ui_out_type_tuple:
- fputc_unfiltered ('}', data->buffer);
+ fputc_unfiltered ('}', stream);
break;
case ui_out_type_list:
- fputc_unfiltered (']', data->buffer);
+ fputc_unfiltered (']', stream);
break;
default:
internal_error (__FILE__, __LINE__, _("bad switch"));
data->suppress_field_separator = 0;
}
-/* Add a string to the buffer. */
-
-void
-mi_out_buffered (struct ui_out *uiout, char *string)
-{
- mi_out_data *data = ui_out_data (uiout);
-
- fprintf_unfiltered (data->buffer, "%s", string);
-}
-
/* Clear the buffer. */
void
mi_out_rewind (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ ui_file *stream = data->streams.back ();
- ui_file_rewind (data->buffer);
+ ui_file_rewind (stream);
}
/* Dump the buffer onto the specified stream. */
void
mi_out_put (struct ui_out *uiout, struct ui_file *stream)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
+ ui_file *outstream = data->streams.back ();
- ui_file_put (data->buffer, ui_file_write_for_put, stream);
- ui_file_rewind (data->buffer);
+ ui_file_put (outstream, ui_file_write_for_put, stream);
+ ui_file_rewind (outstream);
}
/* Return the current MI version. */
int
mi_version (struct ui_out *uiout)
{
- mi_out_data *data = ui_out_data (uiout);
+ mi_out_data *data = (mi_out_data *) ui_out_data (uiout);
return data->mi_version;
}
+/* Constructor for an `mi_out_data' object. */
+
+static void
+mi_out_data_ctor (mi_out_data *self, int mi_version, struct ui_file *stream)
+{
+ gdb_assert (stream != NULL);
+
+ self->streams.push_back (stream);
+
+ self->suppress_field_separator = 0;
+ self->mi_version = mi_version;
+}
+
+/* The destructor. */
+
+static void
+mi_out_data_dtor (struct ui_out *ui_out)
+{
+ mi_out_data *data = (mi_out_data *) ui_out_data (ui_out);
+
+ delete data;
+}
+
/* Initialize private members at startup. */
struct ui_out *
mi_out_new (int mi_version)
{
- int flags = 0;
+ ui_out_flags flags = 0;
+ mi_out_data *data = new mi_out_data ();
+ struct ui_file *stream = mem_fileopen ();
- mi_out_data *data = XNEW (mi_out_data);
- data->suppress_field_separator = 0;
- data->suppress_output = 0;
- data->mi_version = mi_version;
- /* FIXME: This code should be using a ``string_file'' and not the
- TUI buffer hack. */
- data->buffer = mem_fileopen ();
+ mi_out_data_ctor (data, mi_version, stream);
return ui_out_new (&mi_ui_out_impl, data, flags);
}
projects / deliverable / binutils-gdb.git / blobdiff