OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup ui-out table impl. Add struct ui_out_table. Rename 

curr[ent]_header to next_header.
This commit is contained in:
Andrew Cagney 2001-12-07 17:51:13 +00:00
parent 78c3a8103a
commit bafdd3b3f6
2 changed files with 106 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ChangeLog
View File

@ -1,3 +1,16 @@
2001-12-07 Andrew Cagney <ac131313@redhat.com>
* ui-out.c (ui_out_table_begin): Initialize body_flag.
(struct ui_out_table): New structure. Move table fields to here.
Rename headercurr to headernext.
(struct ui_out): Remove table specific fields. Add field table.
(ui_out_table_begin, ui_out_table_body, ui_out_table_end): Update.
(ui_out_table_header, ui_out_begin): Update.
(verify_field_proper_position, verify_field_alignment): Update.
(ui_out_new, clear_header_list, append_header_to_list): Update.
(get_next_header): Rename get_curr_header. Update comments and
code.
2001-12-06 Andrew Cagney <ac131313@redhat.com> 2001-12-06 Andrew Cagney <ac131313@redhat.com>
* regcache.c (XCALLOC): Delete macro that should not have been * regcache.c (XCALLOC): Delete macro that should not have been

169
gdb/ui-out.c
View File

@ -58,6 +58,38 @@ struct ui_out_level
enum ui_out_type type; enum ui_out_type type;
}; };
/* Tables are special. Maintain a separate structure that tracks
their state. At present an output can only contain a single table
but that restriction might eventually be lifted. */
struct ui_out_table
{
/* If on, a table is being generated. */
int flag;
/* If on, the body of a table is being generated. If off, the table
header is being generated. */
int body_flag;
/* Number of table columns (as specified in the table_begin call). */
int columns;
/* String identifying the table (as specified in the table_begin
call). */
char *id;
/* Points to the first table header (if any). */
struct ui_out_hdr *header_first;
/* Points to the last table header (if any). */
struct ui_out_hdr *header_last;
/* Points to header of NEXT column to format. */
struct ui_out_hdr *header_next;
};
/* The ui_out structure */ /* The ui_out structure */
/* Any change here requires a corresponding one in the initialization /* Any change here requires a corresponding one in the initialization
of the default uiout, which is statically initialized */ of the default uiout, which is statically initialized */
@ -69,31 +101,12 @@ struct ui_out
struct ui_out_impl *impl; struct ui_out_impl *impl;
struct ui_out_data *data; struct ui_out_data *data;
/* if on, a table is being generated */ /* Sub structure tracking the ui-out depth. */
int table_flag;
/* if on, the body of a table is being generated */
int body_flag;
/* number of table columns (as specified in the table_begin call) */
int table_columns;
/* strinf identifying the table (as specified in the table_begin call) */
char *table_id;
/* Sub structure tracking the table depth. */
int level; int level;
struct ui_out_level levels[MAX_UI_OUT_LEVELS]; struct ui_out_level levels[MAX_UI_OUT_LEVELS];
/* points to the first header (if any) */ /* A table, if any. At present only a single table is supported. */
struct ui_out_hdr *headerfirst; struct ui_out_table table;
/* points to the last header (if any) */
struct ui_out_hdr *headerlast;
/* points to header of next column to format */
struct ui_out_hdr *headercurr;
}; };
/* The current (inner most) level. */ /* The current (inner most) level. */
@ -246,7 +259,7 @@ extern void _initialize_ui_out (void);
static void append_header_to_list (struct ui_out *uiout, int width, static void append_header_to_list (struct ui_out *uiout, int width,
int alignment, const char *col_name, int alignment, const char *col_name,
const char *colhdr); const char *colhdr);
static int get_curr_header (struct ui_out *uiout, int *colno, int *width, static int get_next_header (struct ui_out *uiout, int *colno, int *width,
int *alignment, char **colhdr); int *alignment, char **colhdr);
static void clear_header_list (struct ui_out *uiout); static void clear_header_list (struct ui_out *uiout);
static void verify_field_proper_position (struct ui_out *uiout); static void verify_field_proper_position (struct ui_out *uiout);
@ -263,40 +276,41 @@ ui_out_table_begin (struct ui_out *uiout, int nbrofcols,
int nr_rows, int nr_rows,
const char *tblid) const char *tblid)
{ {
if (uiout->table_flag) if (uiout->table.flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"tables cannot be nested; table_begin found before \ "tables cannot be nested; table_begin found before \
previous table_end."); previous table_end.");
uiout->table_flag = 1; uiout->table.flag = 1;
uiout->table_columns = nbrofcols; uiout->table.body_flag = 0;
uiout->table.columns = nbrofcols;
if (tblid != NULL) if (tblid != NULL)
uiout->table_id = xstrdup (tblid); uiout->table.id = xstrdup (tblid);
else else
uiout->table_id = NULL; uiout->table.id = NULL;
clear_header_list (uiout); clear_header_list (uiout);
uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table_id); uo_table_begin (uiout, nbrofcols, nr_rows, uiout->table.id);
} }
void void
ui_out_table_body (struct ui_out *uiout) ui_out_table_body (struct ui_out *uiout)
{ {
if (!uiout->table_flag) if (!uiout->table.flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"table_body outside a table is not valid; it must be \ "table_body outside a table is not valid; it must be \
after a table_begin and before a table_end."); after a table_begin and before a table_end.");
if (uiout->body_flag) if (uiout->table.body_flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"extra table_body call not allowed; there must be \ "extra table_body call not allowed; there must be \
only one table_body after a table_begin and before a table_end."); only one table_body after a table_begin and before a table_end.");
if (uiout->headercurr->colno != uiout->table_columns) if (uiout->table.header_next->colno != uiout->table.columns)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"number of headers differ from number of table \ "number of headers differ from number of table \
columns."); columns.");
uiout->body_flag = 1; uiout->table.body_flag = 1;
uiout->headercurr = uiout->headerfirst; uiout->table.header_next = uiout->table.header_first;
uo_table_body (uiout); uo_table_body (uiout);
} }
@ -304,17 +318,17 @@ columns.");
void void
ui_out_table_end (struct ui_out *uiout) ui_out_table_end (struct ui_out *uiout)
{ {
if (!uiout->table_flag) if (!uiout->table.flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"misplaced table_end or missing table_begin."); "misplaced table_end or missing table_begin.");
uiout->body_flag = 0; uiout->table.body_flag = 0;
uiout->table_flag = 0; uiout->table.flag = 0;
uo_table_end (uiout); uo_table_end (uiout);
if (uiout->table_id) if (uiout->table.id)
xfree (uiout->table_id); xfree (uiout->table.id);
clear_header_list (uiout); clear_header_list (uiout);
} }
@ -323,7 +337,7 @@ ui_out_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
const char *col_name, const char *col_name,
const char *colhdr) const char *colhdr)
{ {
if (!uiout->table_flag || uiout->body_flag) if (!uiout->table.flag || uiout->table.body_flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"table header must be specified after table_begin \ "table header must be specified after table_begin \
and before table_body."); and before table_body.");
@ -339,13 +353,13 @@ ui_out_begin (struct ui_out *uiout,
const char *id) const char *id)
{ {
int new_level; int new_level;
if (uiout->table_flag && !uiout->body_flag) if (uiout->table.flag && !uiout->table.body_flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"table header or table_body expected; lists must be \ "table header or table_body expected; lists must be \
specified after table_body."); specified after table_body.");
new_level = push_level (uiout, type, id); new_level = push_level (uiout, type, id);
if (uiout->table_flag && (new_level == 1)) if (uiout->table.flag && (new_level == 1))
uiout->headercurr = uiout->headerfirst; uiout->table.header_next = uiout->table.header_first;
uo_begin (uiout, type, new_level, id); uo_begin (uiout, type, new_level, id);
} }
@ -969,16 +983,17 @@ uo_flush (struct ui_out *uiout)
static void static void
clear_header_list (struct ui_out *uiout) clear_header_list (struct ui_out *uiout)
{ {
while (uiout->headerfirst != NULL) while (uiout->table.header_first != NULL)
{ {
uiout->headercurr = uiout->headerfirst; uiout->table.header_next = uiout->table.header_first;
uiout->headerfirst = uiout->headerfirst->next; uiout->table.header_first = uiout->table.header_first->next;
if (uiout->headercurr->colhdr != NULL) if (uiout->table.header_next->colhdr != NULL)
xfree (uiout->headercurr->colhdr); xfree (uiout->table.header_next->colhdr);
xfree (uiout->headercurr); xfree (uiout->table.header_next);
} }
uiout->headerlast = NULL; gdb_assert (uiout->table.header_first == NULL);
uiout->headercurr = NULL; uiout->table.header_last = NULL;
uiout->table.header_next = NULL;
} }
static void static void
@ -1003,38 +1018,40 @@ append_header_to_list (struct ui_out *uiout,
else else
temphdr->col_name = xstrdup (colhdr); temphdr->col_name = xstrdup (colhdr);
temphdr->next = NULL; temphdr->next = NULL;
if (uiout->headerfirst == NULL) if (uiout->table.header_first == NULL)
{ {
temphdr->colno = 1; temphdr->colno = 1;
uiout->headerfirst = temphdr; uiout->table.header_first = temphdr;
uiout->headerlast = temphdr; uiout->table.header_last = temphdr;
} }
else else
{ {
temphdr->colno = uiout->headerlast->colno + 1; temphdr->colno = uiout->table.header_last->colno + 1;
uiout->headerlast->next = temphdr; uiout->table.header_last->next = temphdr;
uiout->headerlast = temphdr; uiout->table.header_last = temphdr;
} }
uiout->headercurr = uiout->headerlast; uiout->table.header_next = uiout->table.header_last;
} }
/* returns 0 if there is no more headers */ /* Extract the format information for the NEXT header and and advance
the header pointer. Return 0 if there was no next header. */
static int static int
get_curr_header (struct ui_out *uiout, get_next_header (struct ui_out *uiout,
int *colno, int *colno,
int *width, int *width,
int *alignment, int *alignment,
char **colhdr) char **colhdr)
{ {
/* There may be no headers at all or we may have used all columns */ /* There may be no headers at all or we may have used all columns. */
if (uiout->headercurr == NULL) if (uiout->table.header_next == NULL)
return 0; return 0;
*colno = uiout->headercurr->colno; *colno = uiout->table.header_next->colno;
*width = uiout->headercurr->width; *width = uiout->table.header_next->width;
*alignment = uiout->headercurr->alignment; *alignment = uiout->table.header_next->alignment;
*colhdr = uiout->headercurr->colhdr; *colhdr = uiout->table.header_next->colhdr;
uiout->headercurr = uiout->headercurr->next; /* Advance the header pointer to the next entry. */
uiout->table.header_next = uiout->table.header_next->next;
return 1; return 1;
} }
@ -1043,9 +1060,9 @@ get_curr_header (struct ui_out *uiout,
static void static void
verify_field_proper_position (struct ui_out *uiout) verify_field_proper_position (struct ui_out *uiout)
{ {
if (uiout->table_flag) if (uiout->table.flag)
{ {
if (!uiout->body_flag) if (!uiout->table.body_flag)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
"table_body missing; table fields must be \ "table_body missing; table fields must be \
specified after table_body and inside a list."); specified after table_body and inside a list.");
@ -1067,8 +1084,8 @@ verify_field_alignment (struct ui_out *uiout,
int colno; int colno;
char *text; char *text;
if (uiout->table_flag if (uiout->table.flag
&& get_curr_header (uiout, &colno, width, align, &text)) && get_next_header (uiout, &colno, width, align, &text))
{ {
if (fldno != colno) if (fldno != colno)
internal_error (__FILE__, __LINE__, internal_error (__FILE__, __LINE__,
@ -1107,13 +1124,13 @@ ui_out_new (struct ui_out_impl *impl,
uiout->data = data; uiout->data = data;
uiout->impl = impl; uiout->impl = impl;
uiout->flags = flags; uiout->flags = flags;
uiout->table_flag = 0; uiout->table.flag = 0;
uiout->body_flag = 0; uiout->table.body_flag = 0;
uiout->level = 0; uiout->level = 0;
memset (uiout->levels, 0, sizeof (uiout->levels)); memset (uiout->levels, 0, sizeof (uiout->levels));
uiout->headerfirst = NULL; uiout->table.header_first = NULL;
uiout->headerlast = NULL; uiout->table.header_last = NULL;
uiout->headercurr = NULL; uiout->table.header_next = NULL;
return uiout; return uiout;
} }