b6fe0bb8c5
Remove pedwarn_with_decl, warning_with_decl and error_with_decl
from GCC.
* calls.c (try_to_integrate): Don't use xxx_with_decl.
(expand_call): Likewise.
* dwarfout.c (output_reg_number): Likewise.
* expr.c (expand_expr): Likewise.
* function.c (assign_temp): Likewise.
(uninitialized_vars_warning): Likewise.
(setjmp_args_warning): Likewise.
(expand_function_end): Likewise.
* stmt.c (fixup_gotos): Likewise.
(warn_about_unused_variables): Likewise.
(expand_end_bindings): Likewise.
* stor-layout.c (layout_decl): Likewise.
(place_field): Likewise.
* toplev.c (check_global_declarations): Likewise.
(rest_of_handle_inlining): Likewise.
(default_tree_printer): New function.
(general_init): Initialize diagnostic machinery before routing
signals to the ICE machinery. Set default tree printer.
* toplev.h (pedwarn_with_decl): Remove declaration.
(warning_with_decl): Likewise.
(error_with_decl): Likewise.
(pedwarn): Remove attribute for the time being.
* tree-inline.c (expand_call_inline): Don't use xxx_with_decl.
* varasm.c (named_section): Likewise.
(make_decl_rtl): Likewise.
(assemble_variable): Likewise.
(merge_weak): Likewise.
(declare_weak): Likewise.
* diagnostic.h: Move non-diagnostic stuff into pretty-print.h.
* diagnostic.c: Move non-diagnostic stuff into pretty-print.c.
(format_with_decl): Remove.
(diagnostic_for_decl): Likewise.
(pedwarn_with_decl): Likewise.
(warning_with_decl): Likewise.
(error_with_decl): Likewise.
(diagnostic_initialize): Adjust.
(diagnostic_count_diagnostic): Likewise.
(announce_function): Likewise.
(lhd_print_error_function): Likewise.
(diagnostic_report_current_module): Likewise.
(default_diagnostic_starter): Likewise.
(diagnostic_report_diagnostic): Likewise.
(default_diagnostic_finalizer): Likewise.
(verbatim): Likewise.
(error): Likewise.
(warning): Likewise.
* opts.c (common_handle_option): Likewise.
* pretty-print.c: New file.
* c-pretty-print.h (pp_base): Override.
* c-pretty-print.c: Adjust use of macros throughout.
(pp_buffer): New macro.
(pp_newline): Likewise.
* c-objc-common.c (c_tree_printer): Adjust prototype. Tidy.
* Makefile.in (DIAGNOSTIC_H): New variable.
(c-errors.o): Use it.
(c-objc-common.o): Likewise.
(c-common.o): Likewise.
(c-opts.o): Likewise.
(c-format.o): Likewise.
(diagnostic.o): Likewise.
(opts.o): Likewise.
(toplev.o): Likewise.
(rtl-error.o): Likewise.
(dwarf2out.o): Likewise.
(jump.o): Likewise.
(pretty-print.o): New rule.
cp/
* Make-lang.in (cp/error.o): Depend on DIAGNOSTIC_H.
* error.c: Use the new pretty-printer fraamework.
From-SVN: r69773
165 lines
6.4 KiB
C
165 lines
6.4 KiB
C
/* Various declarations for the C and C++ pretty-printers.
|
|
Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
|
Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC 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.
|
|
|
|
GCC 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 GCC; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
|
02111-1307, USA. */
|
|
|
|
#ifndef GCC_C_PRETTY_PRINTER
|
|
#define GCC_C_PRETTY_PRINTER
|
|
|
|
#include "tree.h"
|
|
#include "c-common.h"
|
|
#include "pretty-print.h"
|
|
|
|
|
|
/* The data type used to bundle information necessary for pretty-printing
|
|
a C or C++ entity. */
|
|
typedef struct c_pretty_print_info *c_pretty_printer;
|
|
|
|
/* The type of a C pretty-printer 'member' function. */
|
|
typedef void (*c_pretty_print_fn) (c_pretty_printer, tree);
|
|
|
|
struct c_pretty_print_info
|
|
{
|
|
struct pretty_print_info base;
|
|
/* Points to the first element of an array of offset-list.
|
|
Not used yet. */
|
|
int *offset_list;
|
|
|
|
/* These must be overridden by each of the C and C++ front-end to
|
|
reflect their understanding of syntactic productions when they differ. */
|
|
c_pretty_print_fn declaration;
|
|
c_pretty_print_fn declaration_specifiers;
|
|
c_pretty_print_fn type_specifier;
|
|
c_pretty_print_fn declarator;
|
|
c_pretty_print_fn direct_declarator;
|
|
c_pretty_print_fn parameter_declaration;
|
|
c_pretty_print_fn type_id;
|
|
|
|
c_pretty_print_fn statement;
|
|
|
|
c_pretty_print_fn primary_expression;
|
|
c_pretty_print_fn postfix_expression;
|
|
c_pretty_print_fn unary_expression;
|
|
c_pretty_print_fn initializer;
|
|
c_pretty_print_fn multiplicative_expression;
|
|
c_pretty_print_fn conditional_expression;
|
|
c_pretty_print_fn assignment_expression;
|
|
};
|
|
|
|
#undef pp_base
|
|
#define pp_base(PP) (&pp_c_base (PP)->base)
|
|
|
|
#define pp_c_left_paren(PPI) \
|
|
do { \
|
|
pp_left_paren (PPI); \
|
|
pp_c_base (PPI)->base.padding = pp_none; \
|
|
} while (0)
|
|
#define pp_c_right_paren(PPI) \
|
|
do { \
|
|
pp_right_paren (PPI); \
|
|
pp_c_base (PPI)->base.padding = pp_none; \
|
|
} while (0)
|
|
#define pp_c_left_bracket(PPI) \
|
|
do { \
|
|
pp_left_bracket (PPI); \
|
|
pp_c_base (PPI)->base.padding = pp_none; \
|
|
} while (0)
|
|
#define pp_c_right_bracket(PPI) \
|
|
do { \
|
|
pp_right_bracket (PPI); \
|
|
pp_c_base (PPI)->base.padding = pp_none; \
|
|
} while (0)
|
|
#define pp_c_whitespace(PPI) \
|
|
do { \
|
|
pp_space (PPI); \
|
|
pp_c_base (PPI)->base.padding = pp_none; \
|
|
} while (0)
|
|
#define pp_c_maybe_whitespace(PPI) \
|
|
do { \
|
|
if (pp_c_base (PPI)->base.padding != pp_none) \
|
|
pp_c_whitespace (PPI); \
|
|
} while (0)
|
|
#define pp_c_identifier(PPI, ID) \
|
|
do { \
|
|
pp_c_maybe_whitespace (PPI); \
|
|
pp_identifier (PPI, ID); \
|
|
pp_c_base (PPI)->base.padding = pp_before; \
|
|
} while (0)
|
|
|
|
#define pp_c_tree_identifier(PPI, ID) \
|
|
pp_c_identifier (PPI, IDENTIFIER_POINTER (ID))
|
|
|
|
#define pp_declaration(PPI, T) \
|
|
(*pp_c_base (PPI)->declaration) (pp_c_base (PPI), T)
|
|
#define pp_declaration_specifiers(PPI, D) \
|
|
(*pp_c_base (PPI)->declaration_specifiers) (pp_c_base (PPI), D)
|
|
#define pp_type_specifier(PPI, D) \
|
|
(*pp_c_base (PPI)->type_specifier) (pp_c_base (PPI), D)
|
|
#define pp_declarator(PPI, D) \
|
|
(*pp_c_base (PPI)->declarator) (pp_c_base (PPI), D)
|
|
#define pp_direct_declarator(PPI, D) \
|
|
(*pp_c_base (PPI)->direct_declarator) (pp_c_base (PPI), D)
|
|
#define pp_parameter_declaration(PPI, T) \
|
|
(*pp_c_base (PPI)->parameter_declaration) (pp_c_base (PPI), T)
|
|
#define pp_type_id(PPI, D) \
|
|
(*pp_c_base (PPI)->type_id) (pp_c_base (PPI), D)
|
|
|
|
#define pp_statement(PPI, S) \
|
|
(*pp_c_base (PPI)->statement) (pp_c_base (PPI), S)
|
|
|
|
#define pp_primary_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->primary_expression) (pp_c_base (PPI), E)
|
|
#define pp_postfix_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->postfix_expression) (pp_c_base (PPI), E)
|
|
#define pp_unary_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->unary_expression) (pp_c_base (PPI), E)
|
|
#define pp_initializer(PPI, E) \
|
|
(*pp_c_base (PPI)->initializer) (pp_c_base (PPI), E)
|
|
#define pp_multiplicative_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->multiplicative_expression) (pp_c_base (PPI), E)
|
|
#define pp_conditional_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->conditional_expression) (pp_c_base (PPI), E)
|
|
#define pp_assignment_expression(PPI, E) \
|
|
(*pp_c_base (PPI)->assignment_expression) (pp_c_base (PPI), E)
|
|
|
|
|
|
/* Returns the c_pretty_printer base object of PRETTY-PRINTER. This
|
|
macro must be overridden by any subclass of c_pretty_print_info. */
|
|
#define pp_c_base(PP) (PP)
|
|
|
|
extern void pp_c_pretty_printer_init (c_pretty_printer);
|
|
|
|
/* Declarations. */
|
|
void pp_c_attributes (c_pretty_printer, tree);
|
|
void pp_c_cv_qualifier (c_pretty_printer, int);
|
|
void pp_c_parameter_declaration_clause (c_pretty_printer, tree);
|
|
void pp_c_declaration (c_pretty_printer, tree);
|
|
/* Statements. */
|
|
void pp_c_statement (c_pretty_printer, tree);
|
|
/* Expressions. */
|
|
void pp_c_expression (c_pretty_printer, tree);
|
|
void pp_c_logical_or_expression (c_pretty_printer, tree);
|
|
void pp_c_expression_list (c_pretty_printer, tree);
|
|
void pp_c_cast_expression (c_pretty_printer, tree);
|
|
void pp_c_postfix_expression (c_pretty_printer, tree);
|
|
void pp_c_initializer (c_pretty_printer, tree);
|
|
void pp_c_literal (c_pretty_printer, tree);
|
|
|
|
#endif /* GCC_C_PRETTY_PRINTER */
|