FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

error.c (init_error): Use C90 prototype style.

Browse source 
* error.c (init_error): Use C90 prototype style.
        (dump_scope): Likewise.
        (dump_qualifiers): Likewise.
        (dump_template_argument): Likewise.
        (dump_template_argument_list): Likewise.
        (dump_template_parameter): Likewise.
        (dump_template_bindings): Likewise.
        (dump_type): Likewise.
        (dump_typename): Likewise.
        (class_key_or_enum): Likewise.
        (dump_aggr_type): Likewise.
        (dump_type_prefix): Likewise.
        (dump_type_suffix): Likewise.
        (dump_global_iord): Likewise.
        (dump_simple_decl): Likewise.
        (dump_decl): Likewise.
        (dump_template_decl): Likewise.
        (dump_function_decl): Likewise.
        (dump_parameters): Likewise.
        (dump_exception_spec): Likewise.
        (dump_function_name): Likewise.
        (dump_template_parms): Likewise.
        (dump_char): Likewise.
        (dump_expr_list): Likewise.
        (dump_expr): Likewise.
        (dump_binary_op): Likewise.
        (dump_unary_op): Likewise.
        (type_as_string): Likewise.
        (expr_as_string): Likewise.
        (decl_as_string): Likewise.
        (context_as_string): Likewise.
        (lang_decl_name): Likewise.
        (cp_file_of): Likewise.
        (cp_line_of): Likewise.
        (decl_to_string): Likewise.
        (expr_to_string): Likewise.
        (fndecl_to_string): Likewise.
        (code_to_string): Likewise.
        (language_to_string): Likewise.
        (parm_to_string): Likewise.
        (op_to_string): Likewise.
        (type_to_string): Likewise.
        (assop_to_string): Likewise.
        (args_to_string): Likewise.
        (cv_to_string): Likewise.
        (cxx_print_error_function): Likewise.
        (cp_diagnostic_starter): Likewise.
        (cp_diagnostic_finalizer): Likewise.
        (cp_print_error_function): Likewise.
        (function_category): Likewise.
        (print_instantiation_full_context): Likewise.
        (print_instantiation_partial_context): Likewise.
        (maybe_print_instantiation_context): Likewise.
        (print_instantiation_context): Likewise.
        (cp_printer): Likewise.
        (print_integer): Likewise.
        (print_non_consecutive_character): Likewise.
        (locate_error): Likewise.

From-SVN: r63928
This commit is contained in:
Gabriel Dos Reis 2003-03-07 06:46:56 +00:00 • committed by Gabriel Dos Reis
parent 530d4230db
commit 3f8548e7db
2 changed files with 171 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gcc/cp/ChangeLog
View file

@ -1,3 +1,64 @@
2003-03-07 Gabriel Dos Reis <gdr@integrable-solutions.net>
* error.c (init_error): Use C90 prototype style.
(dump_scope): Likewise.
(dump_qualifiers): Likewise.
(dump_template_argument): Likewise.
(dump_template_argument_list): Likewise.
(dump_template_parameter): Likewise.
(dump_template_bindings): Likewise.
(dump_type): Likewise.
(dump_typename): Likewise.
(class_key_or_enum): Likewise.
(dump_aggr_type): Likewise.
(dump_type_prefix): Likewise.
(dump_type_suffix): Likewise.
(dump_global_iord): Likewise.
(dump_simple_decl): Likewise.
(dump_decl): Likewise.
(dump_template_decl): Likewise.
(dump_function_decl): Likewise.
(dump_parameters): Likewise.
(dump_exception_spec): Likewise.
(dump_function_name): Likewise.
(dump_template_parms): Likewise.
(dump_char): Likewise.
(dump_expr_list): Likewise.
(dump_expr): Likewise.
(dump_binary_op): Likewise.
(dump_unary_op): Likewise.
(type_as_string): Likewise.
(expr_as_string): Likewise.
(decl_as_string): Likewise.
(context_as_string): Likewise.
(lang_decl_name): Likewise.
(cp_file_of): Likewise.
(cp_line_of): Likewise.
(decl_to_string): Likewise.
(expr_to_string): Likewise.
(fndecl_to_string): Likewise.
(code_to_string): Likewise.
(language_to_string): Likewise.
(parm_to_string): Likewise.
(op_to_string): Likewise.
(type_to_string): Likewise.
(assop_to_string): Likewise.
(args_to_string): Likewise.
(cv_to_string): Likewise.
(cxx_print_error_function): Likewise.
(cp_diagnostic_starter): Likewise.
(cp_diagnostic_finalizer): Likewise.
(cp_print_error_function): Likewise.
(function_category): Likewise.
(print_instantiation_full_context): Likewise.
(print_instantiation_partial_context): Likewise.
(maybe_print_instantiation_context): Likewise.
(print_instantiation_context): Likewise.
(cp_printer): Likewise.
(print_integer): Likewise.
(print_non_consecutive_character): Likewise.
(locate_error): Likewise.
2003-03-06 Mark Mitchell <mark@codesourcery.com> 2003-03-06 Mark Mitchell <mark@codesourcery.com>
PR c++/9965 PR c++/9965

329
gcc/cp/error.c
View file

@ -62,64 +62,60 @@ static output_buffer *scratch_buffer = &scratch_buffer_rec;
#define reinit_global_formatting_buffer() \ #define reinit_global_formatting_buffer() \
output_clear_message_text (scratch_buffer) output_clear_message_text (scratch_buffer)
static const char *args_to_string PARAMS ((tree, int)); static const char *args_to_string (tree, int);
static const char *assop_to_string PARAMS ((enum tree_code, int)); static const char *assop_to_string (enum tree_code, int);
static const char *code_to_string PARAMS ((enum tree_code, int)); static const char *code_to_string (enum tree_code, int);
static const char *cv_to_string PARAMS ((tree, int)); static const char *cv_to_string (tree, int);
static const char *decl_to_string PARAMS ((tree, int)); static const char *decl_to_string (tree, int);
static const char *expr_to_string PARAMS ((tree, int)); static const char *expr_to_string (tree, int);
static const char *fndecl_to_string PARAMS ((tree, int)); static const char *fndecl_to_string (tree, int);
static const char *op_to_string PARAMS ((enum tree_code, int)); static const char *op_to_string (enum tree_code, int);
static const char *parm_to_string PARAMS ((int, int)); static const char *parm_to_string (int, int);
static const char *type_to_string PARAMS ((tree, int)); static const char *type_to_string (tree, int);
static void dump_type PARAMS ((tree, int)); static void dump_type (tree, int);
static void dump_typename PARAMS ((tree, int)); static void dump_typename (tree, int);
static void dump_simple_decl PARAMS ((tree, tree, int)); static void dump_simple_decl (tree, tree, int);
static void dump_decl PARAMS ((tree, int)); static void dump_decl (tree, int);
static void dump_template_decl PARAMS ((tree, int)); static void dump_template_decl (tree, int);
static void dump_function_decl PARAMS ((tree, int)); static void dump_function_decl (tree, int);
static void dump_expr PARAMS ((tree, int)); static void dump_expr (tree, int);
static void dump_unary_op PARAMS ((const char *, tree, int)); static void dump_unary_op (const char *, tree, int);
static void dump_binary_op PARAMS ((const char *, tree, int)); static void dump_binary_op (const char *, tree, int);
static void dump_aggr_type PARAMS ((tree, int)); static void dump_aggr_type (tree, int);
static enum pad dump_type_prefix PARAMS ((tree, int)); static enum pad dump_type_prefix (tree, int);
static void dump_type_suffix PARAMS ((tree, int)); static void dump_type_suffix (tree, int);
static void dump_function_name PARAMS ((tree, int)); static void dump_function_name (tree, int);
static void dump_expr_list PARAMS ((tree, int)); static void dump_expr_list (tree, int);
static void dump_global_iord PARAMS ((tree)); static void dump_global_iord (tree);
static enum pad dump_qualifiers PARAMS ((tree, enum pad)); static enum pad dump_qualifiers (tree, enum pad);
static void dump_char PARAMS ((int)); static void dump_char (int);
static void dump_parameters PARAMS ((tree, int)); static void dump_parameters (tree, int);
static void dump_exception_spec PARAMS ((tree, int)); static void dump_exception_spec (tree, int);
static const char *class_key_or_enum PARAMS ((tree)); static const char *class_key_or_enum (tree);
static void dump_template_argument PARAMS ((tree, int)); static void dump_template_argument (tree, int);
static void dump_template_argument_list PARAMS ((tree, int)); static void dump_template_argument_list (tree, int);
static void dump_template_parameter PARAMS ((tree, int)); static void dump_template_parameter (tree, int);
static void dump_template_bindings PARAMS ((tree, tree)); static void dump_template_bindings (tree, tree);
static void dump_scope PARAMS ((tree, int)); static void dump_scope (tree, int);
static void dump_template_parms PARAMS ((tree, int, int)); static void dump_template_parms (tree, int, int);
static const char *function_category PARAMS ((tree)); static const char *function_category (tree);
static void maybe_print_instantiation_context PARAMS ((diagnostic_context *)); static void maybe_print_instantiation_context (diagnostic_context *);
static void print_instantiation_full_context PARAMS ((diagnostic_context *)); static void print_instantiation_full_context (diagnostic_context *);
static void print_instantiation_partial_context PARAMS ((diagnostic_context *, static void print_instantiation_partial_context (diagnostic_context *,
tree, tree, const char *, int);
const char *, int)); static void cp_diagnostic_starter (diagnostic_context *, diagnostic_info *);
static void cp_diagnostic_starter PARAMS ((diagnostic_context *, static void cp_diagnostic_finalizer (diagnostic_context *, diagnostic_info *);
diagnostic_info *)); static void cp_print_error_function (diagnostic_context *, diagnostic_info *);
static void cp_diagnostic_finalizer PARAMS ((diagnostic_context *,
diagnostic_info *));
static void cp_print_error_function PARAMS ((diagnostic_context *,
diagnostic_info *));
static bool cp_printer PARAMS ((output_buffer *, text_info *)); static bool cp_printer (output_buffer *, text_info *);
static void print_non_consecutive_character PARAMS ((output_buffer *, int)); static void print_non_consecutive_character (output_buffer *, int);
static void print_integer PARAMS ((output_buffer *, HOST_WIDE_INT)); static void print_integer (output_buffer *, HOST_WIDE_INT);
static tree locate_error PARAMS ((const char *, va_list)); static tree locate_error (const char *, va_list);
void void
init_error () init_error (void)
{ {
diagnostic_starter (global_dc) = cp_diagnostic_starter; diagnostic_starter (global_dc) = cp_diagnostic_starter;
diagnostic_finalizer (global_dc) = cp_diagnostic_finalizer; diagnostic_finalizer (global_dc) = cp_diagnostic_finalizer;
@ -131,9 +127,7 @@ init_error ()
/* Dump a scope, if deemed necessary. */ /* Dump a scope, if deemed necessary. */
static void static void
dump_scope (scope, flags) dump_scope (tree scope, int flags)
tree scope;
int flags;
{ {
int f = ~TFF_RETURN_TYPE & (flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF)); int f = ~TFF_RETURN_TYPE & (flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF));
@ -164,9 +158,7 @@ dump_scope (scope, flags)
indication of whether we dumped something. */ indication of whether we dumped something. */
static enum pad static enum pad
dump_qualifiers (t, p) dump_qualifiers (tree t, enum pad p)
tree t;
enum pad p;
{ {
static const int masks[] = static const int masks[] =
{TYPE_QUAL_CONST, TYPE_QUAL_VOLATILE, TYPE_QUAL_RESTRICT}; {TYPE_QUAL_CONST, TYPE_QUAL_VOLATILE, TYPE_QUAL_RESTRICT};
@ -201,9 +193,7 @@ static char digit_buffer[128];
/* Dump the template ARGument under control of FLAGS. */ /* Dump the template ARGument under control of FLAGS. */
static void static void
dump_template_argument (arg, flags) dump_template_argument (tree arg, int flags)
tree arg;
int flags;
{ {
if (TYPE_P (arg) || TREE_CODE (arg) == TEMPLATE_DECL) if (TYPE_P (arg) || TREE_CODE (arg) == TEMPLATE_DECL)
dump_type (arg, flags & ~TFF_CLASS_KEY_OR_ENUM); dump_type (arg, flags & ~TFF_CLASS_KEY_OR_ENUM);
@ -215,9 +205,7 @@ dump_template_argument (arg, flags)
of FLAGS. */ of FLAGS. */
static void static void
dump_template_argument_list (args, flags) dump_template_argument_list (tree args, int flags)
tree args;
int flags;
{ {
int n = TREE_VEC_LENGTH (args); int n = TREE_VEC_LENGTH (args);
int need_comma = 0; int need_comma = 0;
@ -235,9 +223,7 @@ dump_template_argument_list (args, flags)
/* Dump a template parameter PARM (a TREE_LIST) under control of FLAGS. */ /* Dump a template parameter PARM (a TREE_LIST) under control of FLAGS. */
static void static void
dump_template_parameter (parm, flags) dump_template_parameter (tree parm, int flags)
tree parm;
int flags;
{ {
tree p = TREE_VALUE (parm); tree p = TREE_VALUE (parm);
tree a = TREE_PURPOSE (parm); tree a = TREE_PURPOSE (parm);
@ -276,8 +262,7 @@ dump_template_parameter (parm, flags)
TREE_VEC. */ TREE_VEC. */
static void static void
dump_template_bindings (parms, args) dump_template_bindings (tree parms, tree args)
tree parms, args;
{ {
int need_comma = 0; int need_comma = 0;
@ -321,9 +306,7 @@ dump_template_bindings (parms, args)
format. */ format. */
static void static void
dump_type (t, flags) dump_type (tree t, int flags)
tree t;
int flags;
{ {
if (t == NULL_TREE) if (t == NULL_TREE)
return; return;
@ -486,9 +469,7 @@ dump_type (t, flags)
a TYPENAME_TYPE. */ a TYPENAME_TYPE. */
static void static void
dump_typename (t, flags) dump_typename (tree t, int flags)
tree t;
int flags;
{ {
tree ctx = TYPE_CONTEXT (t); tree ctx = TYPE_CONTEXT (t);
@ -503,8 +484,7 @@ dump_typename (t, flags)
/* Return the name of the supplied aggregate, or enumeral type. */ /* Return the name of the supplied aggregate, or enumeral type. */
static const char * static const char *
class_key_or_enum (t) class_key_or_enum (tree t)
tree t;
{ {
if (TREE_CODE (t) == ENUMERAL_TYPE) if (TREE_CODE (t) == ENUMERAL_TYPE)
return "enum"; return "enum";
@ -520,9 +500,7 @@ class_key_or_enum (t)
in the form `class foo'. */ in the form `class foo'. */
static void static void
dump_aggr_type (t, flags) dump_aggr_type (tree t, int flags)
tree t;
int flags;
{ {
tree name; tree name;
const char *variety = class_key_or_enum (t); const char *variety = class_key_or_enum (t);
@ -595,9 +573,7 @@ dump_aggr_type (t, flags)
want to pad non-*, non-& cores, but not pad * or & types. */ want to pad non-*, non-& cores, but not pad * or & types. */
static enum pad static enum pad
dump_type_prefix (t, flags) dump_type_prefix (tree t, int flags)
tree t;
int flags;
{ {
enum pad padding = before; enum pad padding = before;
@ -706,9 +682,7 @@ dump_type_prefix (t, flags)
which appears after the identifier (or function parms). */ which appears after the identifier (or function parms). */
static void static void
dump_type_suffix (t, flags) dump_type_suffix (tree t, int flags)
tree t;
int flags;
{ {
if (TYPE_PTRMEMFUNC_P (t)) if (TYPE_PTRMEMFUNC_P (t))
t = TYPE_PTRMEMFUNC_FN_TYPE (t); t = TYPE_PTRMEMFUNC_FN_TYPE (t);
@ -797,8 +771,7 @@ dump_type_suffix (t, flags)
} }
static void static void
dump_global_iord (t) dump_global_iord (tree t)
tree t;
{ {
const char *p = NULL; const char *p = NULL;
@ -813,10 +786,7 @@ dump_global_iord (t)
} }
static void static void
dump_simple_decl (t, type, flags) dump_simple_decl (tree t, tree type, int flags)
tree t;
tree type;
int flags;
{ {
if (flags & TFF_DECL_SPECIFIERS) if (flags & TFF_DECL_SPECIFIERS)
{ {
@ -836,9 +806,7 @@ dump_simple_decl (t, type, flags)
/* Dump a human readable string for the decl T under control of FLAGS. */ /* Dump a human readable string for the decl T under control of FLAGS. */
static void static void
dump_decl (t, flags) dump_decl (tree t, int flags)
tree t;
int flags;
{ {
if (t == NULL_TREE) if (t == NULL_TREE)
return; return;
@ -1031,9 +999,7 @@ dump_decl (t, flags)
'template <...> leaders plus the 'class X' or 'void fn(...)' part. */ 'template <...> leaders plus the 'class X' or 'void fn(...)' part. */
static void static void
dump_template_decl (t, flags) dump_template_decl (tree t, int flags)
tree t;
int flags;
{ {
tree orig_parms = DECL_TEMPLATE_PARMS (t); tree orig_parms = DECL_TEMPLATE_PARMS (t);
tree parms; tree parms;
@ -1099,9 +1065,7 @@ dump_template_decl (t, flags)
is %D which doesn't print the throw specs, and %F which does. */ is %D which doesn't print the throw specs, and %F which does. */
static void static void
dump_function_decl (t, flags) dump_function_decl (tree t, int flags)
tree t;
int flags;
{ {
tree fntype; tree fntype;
tree parmtypes; tree parmtypes;
@ -1193,9 +1157,7 @@ dump_function_decl (t, flags)
already been removed. */ already been removed. */
static void static void
dump_parameters (parmtypes, flags) dump_parameters (tree parmtypes, int flags)
tree parmtypes;
int flags;
{ {
int first; int first;
@ -1227,9 +1189,7 @@ dump_parameters (parmtypes, flags)
/* Print an exception specification. T is the exception specification. */ /* Print an exception specification. T is the exception specification. */
static void static void
dump_exception_spec (t, flags) dump_exception_spec (tree t, int flags)
tree t;
int flags;
{ {
if (t) if (t)
{ {
@ -1251,9 +1211,7 @@ dump_exception_spec (t, flags)
and destructors properly. */ and destructors properly. */
static void static void
dump_function_name (t, flags) dump_function_name (tree t, int flags)
tree t;
int flags;
{ {
tree name = DECL_NAME (t); tree name = DECL_NAME (t);
@ -1302,10 +1260,7 @@ dump_function_name (t, flags)
decoration. */ decoration. */
static void static void
dump_template_parms (info, primary, flags) dump_template_parms (tree info, int primary, int flags)
tree info;
int primary;
int flags;
{ {
tree args = info ? TI_ARGS (info) : NULL_TREE; tree args = info ? TI_ARGS (info) : NULL_TREE;
@ -1378,8 +1333,7 @@ dump_template_parms (info, primary, flags)
} }
static void static void
dump_char (c) dump_char (int c)
int c;
{ {
switch (c) switch (c)
{ {
@ -1427,9 +1381,7 @@ dump_char (c)
/* Print out a list of initializers (subr of dump_expr) */ /* Print out a list of initializers (subr of dump_expr) */
static void static void
dump_expr_list (l, flags) dump_expr_list (tree l, int flags)
tree l;
int flags;
{ {
while (l) while (l)
{ {
@ -1443,9 +1395,7 @@ dump_expr_list (l, flags)
/* Print out an expression E under control of FLAGS. */ /* Print out an expression E under control of FLAGS. */
static void static void
dump_expr (t, flags) dump_expr (tree t, int flags)
tree t;
int flags;
{ {
if (t == 0) if (t == 0)
return; return;
@ -2068,10 +2018,7 @@ dump_expr (t, flags)
} }
static void static void
dump_binary_op (opstring, t, flags) dump_binary_op (const char *opstring, tree t, int flags)
const char *opstring;
tree t;
int flags;
{ {
print_left_paren (scratch_buffer); print_left_paren (scratch_buffer);
dump_expr (TREE_OPERAND (t, 0), flags | TFF_EXPR_IN_PARENS); dump_expr (TREE_OPERAND (t, 0), flags | TFF_EXPR_IN_PARENS);
@ -2086,10 +2033,7 @@ dump_binary_op (opstring, t, flags)
} }
static void static void
dump_unary_op (opstring, t, flags) dump_unary_op (const char *opstring, tree t, int flags)
const char *opstring;
tree t;
int flags;
{ {
if (flags & TFF_EXPR_IN_PARENS) if (flags & TFF_EXPR_IN_PARENS)
print_left_paren (scratch_buffer); print_left_paren (scratch_buffer);
@ -2103,9 +2047,7 @@ dump_unary_op (opstring, t, flags)
control. */ control. */
const char * const char *
type_as_string (typ, flags) type_as_string (tree typ, int flags)
tree typ;
int flags;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2115,9 +2057,7 @@ type_as_string (typ, flags)
} }
const char * const char *
expr_as_string (decl, flags) expr_as_string (tree decl, int flags)
tree decl;
int flags;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2127,9 +2067,7 @@ expr_as_string (decl, flags)
} }
const char * const char *
decl_as_string (decl, flags) decl_as_string (tree decl, int flags)
tree decl;
int flags;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2139,9 +2077,7 @@ decl_as_string (decl, flags)
} }
const char * const char *
context_as_string (context, flags) context_as_string (tree context, int flags)
tree context;
int flags;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2153,9 +2089,7 @@ context_as_string (context, flags)
/* Generate the three forms of printable names for cxx_printable_name. */ /* Generate the three forms of printable names for cxx_printable_name. */
const char * const char *
lang_decl_name (decl, v) lang_decl_name (tree decl, int v)
tree decl;
int v;
{ {
if (v >= 2) if (v >= 2)
return decl_as_string (decl, TFF_DECL_SPECIFIERS); return decl_as_string (decl, TFF_DECL_SPECIFIERS);
@ -2177,8 +2111,7 @@ lang_decl_name (decl, v)
} }
const char * const char *
cp_file_of (t) cp_file_of (tree t)
tree t;
{ {
if (TREE_CODE (t) == PARM_DECL && DECL_CONTEXT (t)) if (TREE_CODE (t) == PARM_DECL && DECL_CONTEXT (t))
return DECL_SOURCE_FILE (DECL_CONTEXT (t)); return DECL_SOURCE_FILE (DECL_CONTEXT (t));
@ -2191,8 +2124,7 @@ cp_file_of (t)
} }
int int
cp_line_of (t) cp_line_of (tree t)
tree t;
{ {
int line = 0; int line = 0;
if (TREE_CODE (t) == PARM_DECL && DECL_CONTEXT (t)) if (TREE_CODE (t) == PARM_DECL && DECL_CONTEXT (t))
@ -2219,9 +2151,7 @@ cp_line_of (t)
function. */ function. */
static const char * static const char *
decl_to_string (decl, verbose) decl_to_string (tree decl, int verbose)
tree decl;
int verbose;
{ {
int flags = 0; int flags = 0;
@ -2242,9 +2172,7 @@ decl_to_string (decl, verbose)
} }
static const char * static const char *
expr_to_string (decl, verbose) expr_to_string (tree decl, int verbose ATTRIBUTE_UNUSED)
tree decl;
int verbose ATTRIBUTE_UNUSED;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2254,9 +2182,7 @@ expr_to_string (decl, verbose)
} }
static const char * static const char *
fndecl_to_string (fndecl, verbose) fndecl_to_string (tree fndecl, int verbose)
tree fndecl;
int verbose;
{ {
int flags; int flags;
@ -2272,17 +2198,13 @@ fndecl_to_string (fndecl, verbose)
static const char * static const char *
code_to_string (c, v) code_to_string (enum tree_code c, int v ATTRIBUTE_UNUSED)
enum tree_code c;
int v ATTRIBUTE_UNUSED;
{ {
return tree_code_name [c]; return tree_code_name [c];
} }
const char * const char *
language_to_string (c, v) language_to_string (enum languages c, int v ATTRIBUTE_UNUSED)
enum languages c;
int v ATTRIBUTE_UNUSED;
{ {
switch (c) switch (c)
{ {
@ -2304,9 +2226,7 @@ language_to_string (c, v)
/* Return the proper printed version of a parameter to a C++ function. */ /* Return the proper printed version of a parameter to a C++ function. */
static const char * static const char *
parm_to_string (p, v) parm_to_string (int p, int v ATTRIBUTE_UNUSED)
int p;
int v ATTRIBUTE_UNUSED;
{ {
if (p < 0) if (p < 0)
return "`this'"; return "`this'";
@ -2316,9 +2236,7 @@ parm_to_string (p, v)
} }
static const char * static const char *
op_to_string (p, v) op_to_string (enum tree_code p, int v ATTRIBUTE_UNUSED)
enum tree_code p;
int v ATTRIBUTE_UNUSED;
{ {
tree id; tree id;
@ -2327,9 +2245,7 @@ op_to_string (p, v)
} }
static const char * static const char *
type_to_string (typ, verbose) type_to_string (tree typ, int verbose)
tree typ;
int verbose;
{ {
int flags; int flags;
@ -2346,9 +2262,7 @@ type_to_string (typ, verbose)
} }
static const char * static const char *
assop_to_string (p, v) assop_to_string (enum tree_code p, int v ATTRIBUTE_UNUSED)
enum tree_code p;
int v ATTRIBUTE_UNUSED;
{ {
tree id; tree id;
@ -2357,9 +2271,7 @@ assop_to_string (p, v)
} }
static const char * static const char *
args_to_string (p, verbose) args_to_string (tree p, int verbose)
tree p;
int verbose;
{ {
int flags = 0; int flags = 0;
if (verbose) if (verbose)
@ -2385,9 +2297,7 @@ args_to_string (p, verbose)
} }
static const char * static const char *
cv_to_string (p, v) cv_to_string (tree p, int v)
tree p;
int v;
{ {
reinit_global_formatting_buffer (); reinit_global_formatting_buffer ();
@ -2398,9 +2308,7 @@ cv_to_string (p, v)
/* Langhook for print_error_function. */ /* Langhook for print_error_function. */
void void
cxx_print_error_function (context, file) cxx_print_error_function (diagnostic_context *context, const char *file)
diagnostic_context *context;
const char *file;
{ {
lhd_print_error_function (context, file); lhd_print_error_function (context, file);
output_set_prefix (&context->buffer, file); output_set_prefix (&context->buffer, file);
@ -2408,9 +2316,8 @@ cxx_print_error_function (context, file)
} }
static void static void
cp_diagnostic_starter (context, diagnostic) cp_diagnostic_starter (diagnostic_context *context,
diagnostic_context *context; diagnostic_info *diagnostic)
diagnostic_info *diagnostic;
{ {
diagnostic_report_current_module (context); diagnostic_report_current_module (context);
cp_print_error_function (context, diagnostic); cp_print_error_function (context, diagnostic);
@ -2419,9 +2326,8 @@ cp_diagnostic_starter (context, diagnostic)
} }
static void static void
cp_diagnostic_finalizer (context, diagnostic) cp_diagnostic_finalizer (diagnostic_context *context,
diagnostic_context *context; diagnostic_info *diagnostic ATTRIBUTE_UNUSED)
diagnostic_info *diagnostic __attribute__((unused));
{ {
output_destroy_prefix (&context->buffer); output_destroy_prefix (&context->buffer);
} }
@ -2429,9 +2335,8 @@ cp_diagnostic_finalizer (context, diagnostic)
/* Print current function onto BUFFER, in the process of reporting /* Print current function onto BUFFER, in the process of reporting
a diagnostic message. Called from cp_diagnostic_starter. */ a diagnostic message. Called from cp_diagnostic_starter. */
static void static void
cp_print_error_function (context, diagnostic) cp_print_error_function (diagnostic_context *context,
diagnostic_context *context; diagnostic_info *diagnostic)
diagnostic_info *diagnostic;
{ {
if (diagnostic_last_function_changed (context)) if (diagnostic_last_function_changed (context))
{ {
@ -2458,8 +2363,7 @@ cp_print_error_function (context, diagnostic)
/* Returns a description of FUNCTION using standard terminology. */ /* Returns a description of FUNCTION using standard terminology. */
static const char * static const char *
function_category (fn) function_category (tree fn)
tree fn;
{ {
if (DECL_FUNCTION_MEMBER_P (fn)) if (DECL_FUNCTION_MEMBER_P (fn))
{ {
@ -2481,8 +2385,7 @@ function_category (fn)
/* Report the full context of a current template instantiation, /* Report the full context of a current template instantiation,
onto BUFFER. */ onto BUFFER. */
static void static void
print_instantiation_full_context (context) print_instantiation_full_context (diagnostic_context *context)
diagnostic_context *context;
{ {
tree p = current_instantiation (); tree p = current_instantiation ();
int line = lineno; int line = lineno;
@ -2517,11 +2420,8 @@ print_instantiation_full_context (context)
/* Same as above but less verbose. */ /* Same as above but less verbose. */
static void static void
print_instantiation_partial_context (context, t, file, line) print_instantiation_partial_context (diagnostic_context *context,
diagnostic_context *context; tree t, const char *file, int line)
tree t;
const char *file;
int line;
{ {
for (; t; t = TREE_CHAIN (t)) for (; t; t = TREE_CHAIN (t))
{ {
@ -2536,8 +2436,7 @@ print_instantiation_partial_context (context, t, file, line)
/* Called from cp_thing to print the template context for an error. */ /* Called from cp_thing to print the template context for an error. */
static void static void
maybe_print_instantiation_context (context) maybe_print_instantiation_context (diagnostic_context *context)
diagnostic_context *context;
{ {
if (!problematic_instantiation_changed () || current_instantiation () == 0) if (!problematic_instantiation_changed () || current_instantiation () == 0)
return; return;
@ -2548,7 +2447,7 @@ maybe_print_instantiation_context (context)
/* Report the bare minimum context of a template instantiation. */ /* Report the bare minimum context of a template instantiation. */
void void
print_instantiation_context () print_instantiation_context (void)
{ {
print_instantiation_partial_context print_instantiation_partial_context
(global_dc, current_instantiation (), input_filename, lineno); (global_dc, current_instantiation (), input_filename, lineno);
@ -2569,9 +2468,7 @@ print_instantiation_context ()
%T type. %T type.
%V cv-qualifier. */ %V cv-qualifier. */
static bool static bool
cp_printer (buffer, text) cp_printer (output_buffer *buffer, text_info *text)
output_buffer *buffer;
text_info *text;
{ {
int verbose = 0; int verbose = 0;
const char *result; const char *result;
@ -2615,18 +2512,14 @@ cp_printer (buffer, text)
} }
static void static void
print_integer (buffer, i) print_integer (output_buffer *buffer, HOST_WIDE_INT i)
output_buffer *buffer;
HOST_WIDE_INT i;
{ {
sprintf (digit_buffer, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) i); sprintf (digit_buffer, HOST_WIDE_INT_PRINT_DEC, (HOST_WIDE_INT) i);
output_add_string (buffer, digit_buffer); output_add_string (buffer, digit_buffer);
} }
static void static void
print_non_consecutive_character (buffer, c) print_non_consecutive_character (output_buffer *buffer, int c)
output_buffer *buffer;
int c;
{ {
const char *p = output_last_position (buffer); const char *p = output_last_position (buffer);
@ -2639,9 +2532,7 @@ print_non_consecutive_character (buffer, c)
behavior of cp_*_at. */ behavior of cp_*_at. */
static tree static tree
locate_error (msgid, ap) locate_error (const char *msgid, va_list ap)
const char *msgid;
va_list ap;
{ {
tree here = 0, t; tree here = 0, t;
int plus = 0; int plus = 0;