4038c495fc
* c-common.c (complete_array_type): Update to cope with VEC in CONSTRUCTOR_ELTS. * c-pretty-print.c (pp_c_initializer_list): Use pp_c_constructor_elts. (pp_c_constructor_elts): New function. * c-pretty-print.h (pp_c_constructor_elts): Declare. * c-typeck.c (build_function_call, build_c_cast, digest_init, struct constructor_stack, struct initializer_stack, constructor_elements, push_init_level, pop_init_level, add_pending_init, find_init_member, output_init_element): Update to cope with VEC in CONSTRUCTOR_ELTS. * coverage.c (build_fn_info_value, build_ctr_info_value, build_gcov_info): Likewise. * expr.c (categorize_ctor_elements_1, store_constructor, expand_expr_real_1): Likewise. * fold-const.c (fold_ternary): Likewise. * gimplify.c (gimplify_init_ctor_preeval, zero_sized_field_decl, gimplify_init_constructor, gimplify_expr): Likewise. * tree-dump.c (dequeue_and_dump): Likewise. * tree-inline.c (copy_tree_r): Add code to duplicate a CONSTRUCTOR node. * tree-pretty-print.c (dump_generic_node): Update to cope with VEC in CONSTRUCTOR_ELTS. * tree-sra.c (generate_element_init_1): Likewise. * tree-ssa-ccp.c (fold_const_aggregate_ref): Likewise. * tree-ssa-operands.c (get_expr_operands): Likewise. * tree-vect-generic.c (expand_vector_piecewise): Likewise. * tree-vect-transform.c (vect_get_vec_def_for_operand): (get_initial_def_for_reduction): Likewise. * tree-vn.c (set_value_handle, get_value_handle): CONSTURCTOR uses value handle in annotations. * tree.c (tree_node_kind, tree_code_size, make_node_stat, tree_node_structure): Add support for constr_kind. (build_vector_from_ctor, build_constructor_single, build_constructor_from_list): New functions. (build_constructor): Update to take a VEC instead of a TREE_LIST. (simple_cst_equal, iterative_hash_expr, initializer_zerop, walk_tree): Update to cope with VEC in CONSTRUCTOR_ELTS. * tree.def (CONSTRUCTOR): Make it a tcc_exceptional node. * tree.h (FOR_EACH_CONSTRUCTOR_VALUE, FOR_EACH_CONSTRUCTOR_ELT, CONSTRUCTOR_APPEND_ELT): New macros. (struct constructor_elt, struct tree_constructor): New data types. (union tree_node): Add tree_constructor field. * treestruct.def: Define TS_CONSTRUCTOR. * varasm.c (const_hash_1, compare_constant, copy_constant, compute_reloc_for_constant, output_addressed_constants, initializer_constant_valid_p, output_constant, array_size_for_constructor, output_constructor): Update to cope with VEC in CONSTRUCTOR_ELTS. * vec.h (VEC_empty, VEC_copy): New macros. ada/ Make CONSTRUCTOR use VEC to store initializers. * decl.c (gnat_to_gnu_entity): Update to cope with VEC in CONSTRUCTOR_ELTS. * trans.c (extract_values): Likewise. * utils.c (convert, remove_conversions): Likewise. * utils2.c (contains_save_expr_p, build_binary_op, build_unary_op, gnat_build_constructor): Likewise. cp/ Make CONSTRUCTOR use VEC to store initializers. * call.c (convert_default_arg): Update call to digest_init. * class.c (dump_class_hierarchy, dump_array): Update to cope with VEC in CONSTRUCTOR_ELTS. * cp-tree.h (EMPTY_CONSTRUCTOR_P): Likewise. (finish_compound_literal, digest_init): Update declaration. * decl.c (struct reshape_iter): New data type. (reshape_init_array): Rename to... (reshape_init_array_1): Update to cope with VEC in CONSTRUCTOR_ELTS. (reshape_init): Rewrite from scratch. Split parts into... (reshape_init_array, reshape_init_vector, reshape_init_class, reshape_init_r): New functions. (check_initializer): Update call to reshape_init. Remove obsolete code. (initialize_artificial_var, cp_complete_array_type): Update to cope with VEC in CONSTRUCTOR_ELTS. * decl2.c (grokfield): Update calls to digest_init. (mark_vtable_entries): Update to cope with VEC in CONSTRUCTOR_ELTS. * error.c (dump_expr_init_vec): New function. (dump_expr): Use dump_expr_init_vec. * init.c (build_zero_init, build_vec_init): Update to cope with VEC in CONSTRUCTOR_ELTS. (expand_default_init): Update call to digest_init. * parser.c (cp_parser_postfix_expression): Use a VEC for the initializers. (cp_parser_initializer_list): Build a VEC of initializers. * pt.c (tsubst_copy, tsubst_copy_and_build): Update to cope with VEC in CONSTRUCTOR_ELTS. * rtti.c (tinfo_base_init, generic_initializer, ptr_initializer, ptm_initializer, class_initializer, get_pseudo_ti_init): Use build_constructor_from_list instead of build_constructor. * semantics.c (finish_compound_literal): Update call to digest_init. * tree.c (stabilize_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * typeck.c (build_ptrmemfunc1): Likewise. * typeck2.c: (cxx_incomplete_type_error, split_nonconstant_init_1): Likewise. (store_init_value): Use build_constructor_from_list and update call to digest_init. (digest_init): Rewrite. (process_init_constructor): Rewrite from scratch. Split into... (process_init_constructor_array, picflag_from_initializer, process_init_constructor_record, process_init_constructor_union): New functions. (PICFLAG_ERRONEOUS, PICFLAG_NOT_ALL_CONSTANT, PICFLAG_NOT_ALL_SIMPLE): New macros. (build_functional_cast): Use build_constructor_from_list instead of build_constructor. fortran/ Make CONSTRUCTOR use VEC to store initializers. * trans-array.c (gfc_build_null_descriptor, gfc_trans_array_constructor_value, gfc_conv_array_initializer): Update to cope with VEC in CONSTRUCTOR_ELTS. * trans-common.c (create_common): Likewise. * trans-expr.c (gfc_conv_structure): Likewise. * trans-stmt.c (gfc_trans_character_select): Use build_constructor_from_list instead of build_constructor. java/ Make CONSTRUCTOR use VEC to store initializers. * check-init.c (check_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * class.c (make_field_value, make_method_value, get_dispatch_table, make_class_data, emit_symbol_table, emit_catch_table, emit_assertion_table): Use build_constructor_from_list instead of build_constructor. * constants.c (build_constants_constructor): Likewise. * java-gimplify.c (java_gimplify_new_array_init): Update to cope with VEC in CONSTRUCTOR_ELTS. * java-tree.h (START_RECORD_CONSTRUCTOR, PUSH_SUPER_VALUE, PUSH_FIELD_VALUE, FINISH_RECORD_CONSTRUCTOR): Create a VEC instead of a TREE_LIST. * jcf-write.c (generate_bytecode_insns): Update to cope with VEC in CONSTRUCTOR_ELTS. * parse.y (build_new_array_init): Use build_constructor_from_list instead of build_constructor. (patch_new_array_init): Update to cope with VEC in CONSTRUCTOR_ELTS. (array_constructor_check_entry): Likewise. objc/ Make CONSTRUCTOR use VEC to store initializers. * objc-act.c (objc_build_constructor): Use build_constructor_from_list instead of build_constructor. testsuite/ Make CONSTRUCTOR use VEC to store initializers. * g++.dg/ext/complit3.C: Check for specific error messages. * g++.dg/init/brace2.C: Update error message. * g++.dg/warn/Wbraces2.C: Likewise. From-SVN: r102182
210 lines
8.7 KiB
C
210 lines
8.7 KiB
C
/* Various declarations for the C and C++ pretty-printers.
|
|
Copyright (C) 2002, 2003, 2004 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, 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301, USA. */
|
|
|
|
#ifndef GCC_C_PRETTY_PRINTER
|
|
#define GCC_C_PRETTY_PRINTER
|
|
|
|
#include "tree.h"
|
|
#include "c-common.h"
|
|
#include "pretty-print.h"
|
|
|
|
|
|
typedef enum
|
|
{
|
|
pp_c_flag_abstract = 1 << 1,
|
|
pp_c_flag_last_bit = 2
|
|
} pp_c_pretty_print_flags;
|
|
|
|
|
|
/* 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);
|
|
|
|
/* The datatype that contains information necessary for pretty-printing
|
|
a tree that represents a C construct. Any pretty-printer for a
|
|
language using C/c++ syntax can derive from this datatype and reuse
|
|
facilities provided here. It can do so by having a subobject of type
|
|
c_pretty_printer and override the macro pp_c_base to return a pointer
|
|
to that subobject. Such a pretty-printer has the responsibility to
|
|
initialize the pp_base() part, then call pp_c_pretty_printer_init
|
|
to set up the components that are specific to the C pretty-printer.
|
|
A derived pretty-printer can override any function listed in the
|
|
vtable below. See cp/cxx-pretty-print.h and cp/cxx-pretty-print.c
|
|
for an example of derivation. */
|
|
struct c_pretty_print_info
|
|
{
|
|
pretty_printer base;
|
|
/* Points to the first element of an array of offset-list.
|
|
Not used yet. */
|
|
int *offset_list;
|
|
|
|
pp_flags flags;
|
|
|
|
/* 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 declarator;
|
|
c_pretty_print_fn abstract_declarator;
|
|
c_pretty_print_fn direct_abstract_declarator;
|
|
c_pretty_print_fn type_specifier_seq;
|
|
c_pretty_print_fn direct_declarator;
|
|
c_pretty_print_fn ptr_operator;
|
|
c_pretty_print_fn parameter_list;
|
|
c_pretty_print_fn type_id;
|
|
c_pretty_print_fn simple_type_specifier;
|
|
c_pretty_print_fn function_specifier;
|
|
c_pretty_print_fn storage_class_specifier;
|
|
c_pretty_print_fn initializer;
|
|
|
|
c_pretty_print_fn statement;
|
|
|
|
c_pretty_print_fn id_expression;
|
|
c_pretty_print_fn primary_expression;
|
|
c_pretty_print_fn postfix_expression;
|
|
c_pretty_print_fn unary_expression;
|
|
c_pretty_print_fn multiplicative_expression;
|
|
c_pretty_print_fn conditional_expression;
|
|
c_pretty_print_fn assignment_expression;
|
|
c_pretty_print_fn expression;
|
|
};
|
|
|
|
/* Override the pp_base macro. Derived pretty-printers should not
|
|
touch this macro. Instead they should override pp_c_base instead. */
|
|
#undef pp_base
|
|
#define pp_base(PP) (&pp_c_base (PP)->base)
|
|
|
|
|
|
#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_abstract_declarator(PP, D) \
|
|
pp_c_base (PP)->abstract_declarator (pp_c_base (PP), D)
|
|
#define pp_type_specifier_seq(PPI, D) \
|
|
pp_c_base (PPI)->type_specifier_seq (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_direct_abstract_declarator(PP, D) \
|
|
pp_c_base (PP)->direct_abstract_declarator (pp_c_base (PP), D)
|
|
#define pp_ptr_operator(PP, D) \
|
|
pp_c_base (PP)->ptr_operator (pp_c_base (PP), D)
|
|
#define pp_parameter_list(PPI, T) \
|
|
pp_c_base (PPI)->parameter_list (pp_c_base (PPI), T)
|
|
#define pp_type_id(PPI, D) \
|
|
pp_c_base (PPI)->type_id (pp_c_base (PPI), D)
|
|
#define pp_simple_type_specifier(PP, T) \
|
|
pp_c_base (PP)->simple_type_specifier (pp_c_base (PP), T)
|
|
#define pp_function_specifier(PP, D) \
|
|
pp_c_base (PP)->function_specifier (pp_c_base (PP), D)
|
|
#define pp_storage_class_specifier(PP, D) \
|
|
pp_c_base (PP)->storage_class_specifier (pp_c_base (PP), D);
|
|
|
|
#define pp_statement(PPI, S) \
|
|
pp_c_base (PPI)->statement (pp_c_base (PPI), S)
|
|
|
|
#define pp_id_expression(PP, E) \
|
|
pp_c_base (PP)->id_expression (pp_c_base (PP), E)
|
|
#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)
|
|
#define pp_expression(PP, E) \
|
|
pp_c_base (PP)->expression (pp_c_base (PP), 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 *);
|
|
void pp_c_whitespace (c_pretty_printer *);
|
|
void pp_c_left_paren (c_pretty_printer *);
|
|
void pp_c_right_paren (c_pretty_printer *);
|
|
void pp_c_left_brace (c_pretty_printer *);
|
|
void pp_c_right_brace (c_pretty_printer *);
|
|
void pp_c_left_bracket (c_pretty_printer *);
|
|
void pp_c_right_bracket (c_pretty_printer *);
|
|
void pp_c_dot (c_pretty_printer *);
|
|
void pp_c_ampersand (c_pretty_printer *);
|
|
void pp_c_star (c_pretty_printer *);
|
|
void pp_c_arrow (c_pretty_printer *);
|
|
void pp_c_semicolon (c_pretty_printer *);
|
|
void pp_c_complement (c_pretty_printer *);
|
|
void pp_c_exclamation (c_pretty_printer *);
|
|
void pp_c_space_for_pointer_operator (c_pretty_printer *, tree);
|
|
|
|
/* Declarations. */
|
|
void pp_c_tree_decl_identifier (c_pretty_printer *, tree);
|
|
void pp_c_function_definition (c_pretty_printer *, tree);
|
|
void pp_c_attributes (c_pretty_printer *, tree);
|
|
void pp_c_type_qualifier_list (c_pretty_printer *, tree);
|
|
void pp_c_parameter_type_list (c_pretty_printer *, tree);
|
|
void pp_c_declaration (c_pretty_printer *, tree);
|
|
void pp_c_declaration_specifiers (c_pretty_printer *, tree);
|
|
void pp_c_declarator (c_pretty_printer *, tree);
|
|
void pp_c_direct_declarator (c_pretty_printer *, tree);
|
|
void pp_c_specifier_qualifier_list (c_pretty_printer *, tree);
|
|
void pp_c_function_specifier (c_pretty_printer *, tree);
|
|
void pp_c_type_id (c_pretty_printer *, tree);
|
|
void pp_c_direct_abstract_declarator (c_pretty_printer *, tree);
|
|
void pp_c_type_specifier (c_pretty_printer *, tree);
|
|
void pp_c_storage_class_specifier (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_constructor_elts (c_pretty_printer *, VEC(constructor_elt,gc) *);
|
|
void pp_c_call_argument_list (c_pretty_printer *, tree);
|
|
void pp_c_unary_expression (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_primary_expression (c_pretty_printer *, tree);
|
|
void pp_c_init_declarator (c_pretty_printer *, tree);
|
|
void pp_c_constant (c_pretty_printer *, tree);
|
|
void pp_c_id_expression (c_pretty_printer *, tree);
|
|
void pp_c_identifier (c_pretty_printer *, const char *);
|
|
void pp_c_string_literal (c_pretty_printer *, tree);
|
|
|
|
void print_c_tree (FILE *file, tree t);
|
|
|
|
#endif /* GCC_C_PRETTY_PRINTER */
|