764dbbf2dd
2000-06-06 Gabriel Dos Reis <gdr@codesourcery.com>
* diagnostic.c (output_maximum_width): Remove.
(doing_line_wrapping): Tweak.
(diagnostic_buffer): New object.
(global_output_buffer): New object.
(output_destroy_prefix): New function.
(default_initialize_buffer): Likewise.
(reshape_diagnostic_buffer): Likewise.
(initialize_diagnostics): Likewise.
(output_clear): Tweak.
(line_wrapper_printf): Adjust call to init_output_buffer.
(vline_wrapper_message_with_location): Likewise. Use
output_destroy_prefix.
(v_message_with_decl): Likewise.
* diagnostic.h (struct output_buffer): Constify prefix.
(init_output_buffer, output_get_prefix): Constify.
(diagnostic_message_length_per_line): Likewise.
(reshape_diagnostic_buffer): Declare.
(default_initialize_buffer): Declare.
(initialize_diagnostics): Declare.
(diagnostic_buffer): Declare new obbject.
* toplev.c: #include diagnostic.h
(display_help): Document diagnostic formatting options.
(decode_f_option): Handle diagnostic formatting options.
(main): Setup initialization for diagnostic messages outputter.
* toplev.h (set_message_length): Remove.
* Makefile.in (toplev.o): Depends upon diagnostic.h
* invoke.texi : Document diagnostics formatting options.
cp/
2000-06-06 Gabriel Dos Reis <gdr@codesourcery.com>
* lex.c (lang_init_options): Tweak.
* decl2.c: Remove #inclusion of diagnostic.h
(lang_decode_option): Move diagnostic formatting options to
toplevel.
* lang-options.h: Remove documentation for diagnostic options.
* Makefile.in (lex.o): Depends upon diagnostic.h
From-SVN: r34435
123 lines
5.1 KiB
C
123 lines
5.1 KiB
C
/* Various declarations for language-independent diagnostics subroutines.
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
Contributed by Gabriel Dos Reis <gdr@codesourcery.com>
|
|
|
|
This file is part of GNU CC.
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU CC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU CC; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef __GCC_DIAGNOSTIC_H__
|
|
#define __GCC_DIAGNOSTIC_H__
|
|
|
|
#include "obstack.h"
|
|
|
|
/* Forward declarations. */
|
|
typedef struct output_buffer output_buffer;
|
|
|
|
#define DIAGNOSTICS_SHOW_PREFIX_ONCE 0x0
|
|
#define DIAGNOSTICS_SHOW_PREFIX_NEVER 0x1
|
|
#define DIAGNOSTICS_SHOW_PREFIX_EVERY_LINE 0x2
|
|
|
|
/* The type of front-end specific hook that formats trees into an
|
|
output_buffer. */
|
|
typedef void (*printer_fn) PARAMS ((output_buffer *));
|
|
|
|
/* The output buffer datatype. This is best seen as an abstract datatype. */
|
|
struct output_buffer
|
|
{
|
|
/* Internal data. These fields should not be accessed directly by
|
|
front-ends. */
|
|
|
|
/* The obstack where the text is built up. */
|
|
struct obstack obstack;
|
|
/* The prefix for each new line. */
|
|
const char *prefix;
|
|
/* The amount of characters output so far. */
|
|
int line_length;
|
|
/* The real upper bound of number of characters per line, taking into
|
|
accompt the case of a very very looong prefix. */
|
|
int maximum_length;
|
|
/* The ideal upper bound of number of characters per line, as suggested
|
|
by front-end. */
|
|
int ideal_maximum_length;
|
|
/* Nonzero if current PREFIX was emitted at least once. */
|
|
int emitted_prefix_p;
|
|
/* Tells how often current PREFIX should be emitted:
|
|
o DIAGNOSTICS_SHOW_PREFIX_NEVER: never - not yet supported;
|
|
o DIAGNOSTICS_SHOW_PREFIX_ONCE: emit current PREFIX only once;
|
|
o DIAGNOSTICS_SHOW_PREFIX_EVERY_LINE: emit current PREFIX each time
|
|
a physical line is started. */
|
|
int prefixing_rule;
|
|
|
|
/* Public fields. These are used by front-ends to extract formats and
|
|
arguments from the variable argument-list passed to output_format. */
|
|
|
|
/* The current char to output. Updated by front-end (*format_map) when
|
|
it is called to report front-end printer for a specified format. */
|
|
const char *cursor;
|
|
/* Variable argument-list for formatting. */
|
|
va_list format_args;
|
|
};
|
|
|
|
/* If non-NULL, this function formats data in the BUFFER.
|
|
BUFFER->CURSOR points to a format code. LANG_PRINTER should
|
|
call output_add_string (and related functions) to add data to
|
|
the BUFFER. LANG_PRINTER can read arguments from
|
|
BUFFER->FORMAT_ARGS using VA_ARG. If the BUFFER needs
|
|
additional characters from the format string, it should advance
|
|
the BUFFER->CURSOR as it goes. When LANG_PRINTER returns,
|
|
BUFFER->CURSOR should point to the last character processed. */
|
|
|
|
extern printer_fn lang_printer;
|
|
|
|
extern int diagnostic_message_length_per_line;
|
|
|
|
/* This output buffer is used by front-ends that directly output
|
|
diagnostic messages without going through `error', `warning',
|
|
and simillar functions. In general, such usage should be
|
|
avoided. This global buffer will go away, once all such usage
|
|
has been removed. */
|
|
extern output_buffer *diagnostic_buffer;
|
|
|
|
/* Prototypes */
|
|
void initialize_diagnostics PARAMS ((void));
|
|
void reshape_diagnostic_buffer PARAMS ((void));
|
|
void default_initialize_buffer PARAMS ((output_buffer *));
|
|
void init_output_buffer PARAMS ((output_buffer *, const char *, int));
|
|
void output_clear PARAMS ((output_buffer *));
|
|
const char *output_get_prefix PARAMS ((const output_buffer *));
|
|
void output_set_prefix PARAMS ((output_buffer *, const char *));
|
|
void output_destroy_prefix PARAMS ((output_buffer *));
|
|
void output_set_maximum_length PARAMS ((output_buffer *, int));
|
|
void output_emit_prefix PARAMS ((output_buffer *));
|
|
void output_add_newline PARAMS ((output_buffer *));
|
|
void output_add_space PARAMS ((output_buffer *));
|
|
int output_space_left PARAMS ((const output_buffer *));
|
|
void output_append PARAMS ((output_buffer *, const char *,
|
|
const char *));
|
|
void output_add_character PARAMS ((output_buffer *, int));
|
|
void output_add_integer PARAMS ((output_buffer *, HOST_WIDE_INT));
|
|
void output_add_string PARAMS ((output_buffer *, const char *));
|
|
const char *output_finish PARAMS ((output_buffer *));
|
|
void output_flush_on PARAMS ((output_buffer *, FILE *));
|
|
void output_printf PARAMS ((output_buffer *, const char *,
|
|
...)) ATTRIBUTE_PRINTF_2;
|
|
void output_format PARAMS ((output_buffer *, const char *));
|
|
int output_is_line_wrapping PARAMS ((output_buffer *));
|
|
void set_message_prefixing_rule PARAMS ((int));
|
|
|
|
#endif /* __GCC_DIAGNOSTIC_H__ */
|