struct ui_out_data
{
- int supress_field_separator;
- int first_header;
+ int suppress_field_separator;
+ int suppress_output;
+ int mi_version;
struct ui_file *buffer;
};
/* These are the MI output functions */
-static void mi_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid);
+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, char *colhdr);
+ enum ui_align alig, const char *col_name,
+ const char *colhdr);
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);
static void mi_field_int (struct ui_out *uiout, int fldno, int width,
- enum ui_align alig, char *fldname, int value);
+ enum ui_align alig, const char *fldname, int value);
static void mi_field_skip (struct ui_out *uiout, int fldno, int width,
- enum ui_align alig, char *fldname);
+ enum ui_align alig, const char *fldname);
static void mi_field_string (struct ui_out *uiout, int fldno, int width,
- enum ui_align alig, char *fldname,
+ enum ui_align alig, const char *fldname,
const char *string);
static void mi_field_fmt (struct ui_out *uiout, int fldno,
int width, enum ui_align align,
- char *fldname, char *format, va_list args);
+ const char *fldname, const char *format,
+ va_list args);
static void mi_spaces (struct ui_out *uiout, int numspaces);
-static void mi_text (struct ui_out *uiout, char *string);
-static void mi_message (struct ui_out *uiout, int verbosity, char *format,
- va_list args);
+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);
static void mi_wrap_hint (struct ui_out *uiout, char *identstring);
static void mi_flush (struct ui_out *uiout);
extern void _initialize_mi_out (void);
static void field_separator (struct ui_out *uiout);
-static void mi_open (struct ui_out *uiout, enum ui_out_type type);
+static void mi_open (struct ui_out *uiout, const char *name,
+ enum ui_out_type type);
static void mi_close (struct ui_out *uiout, enum ui_out_type type);
static void out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
/* Mark beginning of a table */
void
-mi_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
+mi_table_begin (struct ui_out *uiout,
+ int nr_cols,
+ int nr_rows,
+ const char *tblid)
{
struct ui_out_data *data = ui_out_data (uiout);
- field_separator (uiout);
- if (tblid)
- fprintf_unfiltered (data->buffer, "%s=", tblid);
- mi_open (uiout, ui_out_type_tuple);
- data->first_header = 0;
- data->supress_field_separator = 1;
+ mi_open (uiout, tblid, ui_out_type_tuple);
+ if (data->mi_version == 0)
+ {
+ if (nr_rows == 0)
+ data->suppress_output = 1;
+ else
+ mi_open (uiout, "hdr", ui_out_type_list);
+ return;
+ }
+ mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
+ "nr_rows", nr_rows);
+ mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
+ "nr_cols", nr_cols);
+ mi_open (uiout, "hdr", ui_out_type_list);
}
/* Mark beginning of a table body */
mi_table_body (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
/* close the table header line if there were any headers */
- if (data->first_header)
- mi_close (uiout, ui_out_type_tuple);
+ mi_close (uiout, ui_out_type_list);
+ if (data->mi_version == 0)
+ return;
+ mi_open (uiout, "body", ui_out_type_list);
}
/* Mark end of a table */
mi_table_end (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
+ data->suppress_output = 0;
+ if (data->mi_version == 0)
+ {
+ mi_close (uiout, ui_out_type_tuple);
+ return;
+ }
+ mi_close (uiout, ui_out_type_list); /* body */
mi_close (uiout, ui_out_type_tuple);
- /* If table was empty this flag did not get reset yet */
- data->supress_field_separator = 0;
}
/* Specify table header */
void
-mi_table_header (struct ui_out *uiout, int width, int alignment, char *colhdr)
+mi_table_header (struct ui_out *uiout, int width, int alignment,
+ const char *col_name,
+ const char *colhdr)
{
struct ui_out_data *data = ui_out_data (uiout);
- if (!data->first_header++)
+ if (data->suppress_output)
+ return;
+ if (data->mi_version == 0)
{
- fputs_unfiltered ("hdr=", data->buffer);
- mi_open (uiout, ui_out_type_tuple);
+ mi_field_string (uiout, 0, width, alignment, 0, colhdr);
+ return;
}
- mi_field_string (uiout, 0, width, alignment, 0, colhdr);
+ 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_close (uiout, ui_out_type_tuple);
}
/* Mark beginning of a list */
const char *id)
{
struct ui_out_data *data = ui_out_data (uiout);
- field_separator (uiout);
- data->supress_field_separator = 1;
- if (id)
- fprintf_unfiltered (data->buffer, "%s=", id);
- mi_open (uiout, type);
+ if (data->suppress_output)
+ return;
+ mi_open (uiout, id, type);
}
/* Mark end of a list */
int level)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
mi_close (uiout, type);
- /* If list was empty this flag did not get reset yet */
- data->supress_field_separator = 0;
}
/* output an int field */
void
mi_field_int (struct ui_out *uiout, int fldno, int width, int alignment,
- char *fldname, int value)
+ const char *fldname, int value)
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
sprintf (buffer, "%d", value);
mi_field_string (uiout, fldno, width, alignment, fldname, buffer);
void
mi_field_skip (struct ui_out *uiout, int fldno, int width, int alignment,
- char *fldname)
+ const char *fldname)
{
+ struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
mi_field_string (uiout, fldno, width, alignment, fldname, "");
}
int fldno,
int width,
int align,
- char *fldname,
+ const char *fldname,
const char *string)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
field_separator (uiout);
if (fldname)
fprintf_unfiltered (data->buffer, "%s=", fldname);
void
mi_field_fmt (struct ui_out *uiout, int fldno,
int width, enum ui_align align,
- char *fldname, char *format, va_list args)
+ const char *fldname,
+ const char *format,
+ va_list args)
{
struct ui_out_data *data = ui_out_data (uiout);
+ if (data->suppress_output)
+ return;
field_separator (uiout);
if (fldname)
fprintf_unfiltered (data->buffer, "%s=\"", fldname);
}
void
-mi_text (struct ui_out *uiout, char *string)
+mi_text (struct ui_out *uiout, const char *string)
{
}
void
-mi_message (struct ui_out *uiout, int verbosity, char *format, va_list args)
+mi_message (struct ui_out *uiout, int verbosity,
+ const char *format,
+ va_list args)
{
}
field_separator (struct ui_out *uiout)
{
struct ui_out_data *data = ui_out_data (uiout);
- if (data->supress_field_separator)
- data->supress_field_separator = 0;
+ if (data->suppress_field_separator)
+ data->suppress_field_separator = 0;
else
fputc_unfiltered (',', data->buffer);
}
static void
mi_open (struct ui_out *uiout,
+ const char *name,
enum ui_out_type type)
{
struct ui_out_data *data = ui_out_data (uiout);
- fputc_unfiltered ('{', data->buffer);
+ field_separator (uiout);
+ data->suppress_field_separator = 1;
+ if (name)
+ fprintf_unfiltered (data->buffer, "%s=", name);
+ switch (type)
+ {
+ case ui_out_type_tuple:
+ fputc_unfiltered ('{', data->buffer);
+ break;
+ case ui_out_type_list:
+ if (data->mi_version == 0)
+ fputc_unfiltered ('{', data->buffer);
+ else
+ fputc_unfiltered ('[', data->buffer);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__, "bad switch");
+ }
}
static void
enum ui_out_type type)
{
struct ui_out_data *data = ui_out_data (uiout);
- fputc_unfiltered ('}', data->buffer);
+ switch (type)
+ {
+ case ui_out_type_tuple:
+ fputc_unfiltered ('}', data->buffer);
+ break;
+ case ui_out_type_list:
+ if (data->mi_version == 0)
+ fputc_unfiltered ('}', data->buffer);
+ else
+ fputc_unfiltered (']', data->buffer);
+ break;
+ default:
+ internal_error (__FILE__, __LINE__, "bad switch");
+ }
+ data->suppress_field_separator = 0;
}
/* add a string to the buffer */
/* initalize private members at startup */
struct ui_out *
-mi_out_new (void)
+mi_out_new (int mi_version)
{
int flags = 0;
struct ui_out_data *data = XMALLOC (struct ui_out_data);
- data->supress_field_separator = 0;
+ data->suppress_field_separator = 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 ();