2002-07-29 21:31:24 +02:00
|
|
|
|
/* Subroutines common to both C and C++ pretty-printers.
|
alias.c, [...]: Update copyright.
* alias.c, basic-block.h, c-common.c, c-common.h,
c-cppbuiltin.c, c-opts.c, c-pragma.c, c-pretty-print.c,
calls.c, cfg.c, cfgcleanup.c, cfgrtl.c, cgraph.h, collect2.c,
combine.c, cppcharset.c, cpphash.h, cppinit.c, cpplib.c,
cpplib.h, cppmacro.c, crtstuff.c, cselib.c, cselib.h,
defaults.h, df.c, dominance.c, et-forest.c, expmed.c, expr.c,
expr.h, fix-header.c, function.h, gcc.c, gcse.c, genattrtab.c,
genautomata.c, genconditions.c, genemit.c, genflags.c,
gengtype.c, gengtype.h, genopinit.c, genrecog.c, gensupport.c,
ggc-zone.c, graph.c, haifa-sched.c, input.h, integrate.c,
langhooks-def.h, langhooks.c, langhooks.h, line-map.c,
line-map.h, local-alloc.c, optabs.c, optabs.h, postreload.c,
ra.h, recog.c, reg-stack.c, regmove.c, reload.c, reorg.c,
rtl.c, sched-deps.c, sched-ebb.c, sdbout.c, system.h,
target.h, targhooks.c, toplev.h, tree-inline.c, unwind-pe.h,
unwind.h, varray.c, varray.h: Update copyright.
From-SVN: r76302
2004-01-21 21:40:04 +01:00
|
|
|
|
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
2002-07-29 21:31:24 +02:00
|
|
|
|
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. */
|
|
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#include "system.h"
|
2002-12-16 19:23:00 +01:00
|
|
|
|
#include "coretypes.h"
|
|
|
|
|
#include "tm.h"
|
2002-07-29 21:31:24 +02:00
|
|
|
|
#include "real.h"
|
|
|
|
|
#include "c-pretty-print.h"
|
2002-08-13 03:38:35 +02:00
|
|
|
|
#include "c-tree.h"
|
c-common.c (lang_gimplify_stmt): Remove next_p argument.
* c-common.c (lang_gimplify_stmt): Remove next_p argument.
(if_elt, if_stack, if_stack_space, c_expand_start_cond, c_finish_then,
c_expand_end_cond, c_expand_start_else, c_finish_else, c_begin_if_stmt,
c_begin_while_stmt, c_finish_while_stmt_cond): Move to c-typeck.c.
(finish_fname_decls, fname_decl): Use statement_lists.
(c_expand_expr_stmt): Don't set last_expr_type.
(c_type_hash): Fix indentation.
(c_safe_from_p): Don't follow TREE_CHAIN.
(c_tree_chain_matters_p): Remove.
* c-common.def (SCOPE_STMT): Remove.
(CLEANUP_STMT): Redefine to contain its own body.
* c-common.h (struct stmt_tree_s): Remove x_last_stmt,
x_last_expr_type, x_last_expr_filename, x_scope_stmt_stack.
Add x_cur_stmt_list.
(last_tree, last_expr_type, last_expr_filename, RECHAIN_STMTS): Remove.
(cur_stmt_list): New.
(STATEMENT_LIST_STMT_EXPR): New.
(SCOPE_BEGIN_P, SCOPE_END_P, SCOPE_STMT_BLOCK, SCOPE_NULLIFIED_P,
SCOPE_NO_CLEANUPS_P, SCOPE_PARTIAL_P, NEW_FOR_SCOPE_P): Remove.
(CLEANUP_BODY): New.
(CLEANUP_DECL): Move to operand 2.
(c_common_stmt_codes): Remove SCOPE_STMT.
(COMPOUND_STMT_NO_SCOPE, COMPOUND_STMT_BODY_BLOCK): Remove.
* c-decl.c (c_scope_stmt_stack, current_scope_stmt_stack): Remove.
(c_push_function_context, c_pop_function_context): Don't save it.
(finish_decl): Set TREE_USED on the decl for a cleanup.
Use push_cleanup.
(store_parm_decls): Use statement lists.
(finish_function): Remove compstmt rule workaround. Use statement
lists. Call finish_fname_decls after finalizing the body.
(c_begin_compound_stmt): Move to c-typeck.c.
* c-dump.c (c_dump_tree): Remove SCOPE_STMT.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts): New.
(c_genericize): Invoke them.
(c_gimplify_stmt): Don't look through TREE_CHAIN. Kill SCOPE_STMT.
(c_build_bind_expr): Export.
(gimplify_block, gimplify_cleanup): Remove.
(gimplify_condition): Use gimplify_stmt.
(gimplify_for_stmt): Remove FOR_INIT_STMT chaining hack.
(gimplify_if_stmt): Remove recursion hack.
(c_gimplify_expr): Remove STMT_EXPR handling.
(stmt_expr_last_stmt, gimplify_stmt_expr): Remove.
(is_last_stmt_of_scope): Remove.
* c-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
* c-mudflap.c (mflang_flush_calls): Use c_begin_compound_stmt,
c_end_compound_stmt.
* c-objc-common.c (build_cdtor): Likewise.
* c-parse.in (primary): Use c_finish_stmt_expr.
(push_scope, pop_scope): Remove.
(c99_block_start, compstmt_start): Use c_begin_compound_stmt.
(c99_block_end, compstmt): Use c_end_compound_stmt.
(c99_block_lineno_labeled_stmt): Likewise.
(compstmt_primary_start): Use c_begin_stmt_expr.
(simple_if, select_or_iter_stmt): Update calls to stmt builders.
(do_stmt_start): Fill in body directly.
(lineno_stmt): Avoid setting lineno on constants.
* c-pretty-print.c (pp_c_statement): Handle STATEMENT_LIST.
Remove SCOPE_STMT.
* c-semantics.c (begin_stmt_tree): Remove.
(push_stmt_list, re_push_stmt_list, pop_stmt_list): New.
(add_stmt): Use statement lists.
(add_scope_stmt, finish_stmt_tree): Remove.
(push_cleanup): New.
* c-tree.h: Move some decls from c-common.h.
* c-typeck.c (c_tree_expr_nonnegative_p): Simplify for statement lists.
(do_case, c_finish_case): Likewise.
(c_finish_then): Take body for then as argument.
(c_finish_else): Similarly.
(c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): New.
(c_begin_stmt_expr, c_finish_stmt_expr): New.
(c_begin_compound_stmt): Do scope management.
(c_end_compound_stmt): New.
* fold-const.c (tree_expr_nonnegative_p): Fix BIND_EXPR.
* gimplify.c (voidify_wrapper_expr): Accept temporary argument.
Look through exception handling constructs.
(gimplify_bind_expr): Accept temporary argument.
(gimplify_target_expr): Special case BIND_EXPR bodies.
(gimplify_expr): Handle fallback == fb_none like a statement.
* langhooks-def.h (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Kill.
* langhooks.c (lhd_tree_inlining_tree_chain_matters_p): Remove.
* langhooks.h (tree_chain_matters_p): Remove.
* stub-objc.c (objc_clear_super_receiver): New.
* tree-gimple.h (voidify_wrapper_expr): Update decl.
(append_to_statement_list, append_to_statement_list_force): Move
to tree-iterator.h.
* tree-inline.c (expand_call_inline): Update call.
(clone_body): Use statement lists.
(walk_tree): Don't check tree_chain_matters_p.
(copy_tree_r): Likewise.
* tree-iterator.c (alloc_stmt_list): Clear lang bits.
(tsi_link_before, tsi_link_after): Set TREE_SIDE_EFFECTS properly.
* tree-iterator.h (append_to_statement_list,
append_to_statement_list_force): Moved from tree-gimple.h.
* tree-pretty-print.c (dump_generic_node): Clean up TARGET_EXPR dump.
* objc/objc-act.c (build_module_descriptor): Use c_begin_compound_stmt.
(objc_enter_block): Likewise.
(objc_exit_block): Use c_end_compound_stmt.
(objc_build_try_enter_fragment): Add #error and comment for
rewriting for OBJCPLUS.
(objc_build_extract_fragment, objc_build_try_epilogue,
objc_build_catch_stmt, objc_build_finally_prologue,
objc_build_finally_epilogue): Update for C statement builders.
* objc/objc-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P):
Remove.
cp/
* call.c (initialize_reference): Don't build CLEANUP_STMT here.
* cp-gimplify.c (cp_gimplify_stmt): Remove next_p argument.
(genericize_try_block): Use gimplify_stmt.
(genericize_catch_block, genericize_eh_spec_block): Likewise.
(cp_gimplify_init_expr): Remove STMT_EXPR special case.
(gimplify_must_not_throw_expr): Update voidify_wrapper_expr call.
* cp-lang.c (LANG_HOOKS_TREE_INLINING_TREE_CHAIN_MATTERS_P): Remove.
(cp_tree_chain_matters_p): Remove.
* cp-tree.h (COMPOUND_STMT_TRY_BLOCK): New.
(COMPOUND_STMT_BODY_BLOCK): New.
(STATEMENT_LIST_NO_SCOPE, STATEMENT_LIST_TRY_BLOCK): New.
(EXPR_STMT_STMT_EXPR_RESULT): New.
(building_stmt_tree): Check cur_stmt_list.
(tf_stmt_expr_cmpd, tf_stmt_expr_body): Remove.
(BCS_NO_SCOPE, BCS_TRY_BLOCK, BCS_FN_BODY): New.
* decl.c (poplevel): Use pop_stmt_list for minding cleanups.
(cp_finish_decl): Use push_cleanup.
(start_function, finish_function): Use statement lists.
(finish_stmt): Do nothing.
* except.c (begin_eh_spec_block): Use statement lists.
(check_handlers_1, check_handlers): Likewise.
* init.c (construct_virtual_base): Don't add extra compound stmts.
(build_vec_init): Likewise.
* name-lookup.c (maybe_push_cleanup_level): Use statement lists.
* name-lookup.h (struct cp_binding_level): Add statement_list.
* parser.c (cp_parser_statement): Take the STMT_EXPR node, not a bool.
(cp_parser_labeled_statement, cp_parser_expression_statement,
cp_parser_statement_seq_opt): Likewise.
(cp_parser_compound_statement): Likewise. Take bool for try block.
(cp_parser_selection_statement): Tidy if processing.
(cp_parser_already_scoped_statement): Rewrite to do what it says.
* pt.c (tsubst_copy): Move STMT_EXPR to tsubst_expr.
(tsubst_expr): Rewrite STMT_EXPR processing. Handle STATEMENT_LIST.
Mind COMPOUND_STMT_TRY_BLOCK, EXPR_STMT_STMT_EXPR_RESULT.
* semantics.c (do_poplevel, do_pushlevel): Use statement lists.
(finish_cond): New, rewritten from FINISH_COND.
(simplify_loop_decl_cond): New.
(finish_expr_stmt): Avoid nested EXPR_STMTs.
(begin_if_stmt, finish_if_stmt_cond, finish_then_clause,
begin_else_clause, finish_else_clause, finish_if_stmt,
begin_while_stmt, finish_while_stmt_cond, finish_while_stmt,
begin_do_stmt, finish_do_body, begin_for_stmt, finish_for_init_stmt,
finish_for_cond, finish_for_stmt, begin_switch_stmt,
finish_switch_cond, finish_switch_stmt, begin_try_block,
finish_try_block, finish_cleanup_try_block, finish_function_try_block,
finish_handler_sequence, finish_function_handler_sequence,
begin_handler, finish_handler_parms, finish_handler,
begin_stmt_expr, finish_stmt_expr_expr, finish_stmt_expr): Rewrite
using statement lists.
(begin_compound_stmt): Replace has_no_scope argument with flags.
Update all callers. Use statement lists.
(finish_compound_stmt): Likewise.
(finish_decl_cleanup, finish_eh_cleanup): Use push_cleanup.
(current_scope_stmt_stack): Remove.
(simplify_aggr_init_expr): Don't muck with TREE_CHAIN.
* typeck2.c (split_nonconstant_init_1, split_nonconstant_init):
Rewrite with statement lists.
testsuite/
* g++.dg/ext/stmtexpr1.C: XFAIL.
* gcc.dg/20030612-1.c: XFAIL.
From-SVN: r83221
2004-06-16 03:21:38 +02:00
|
|
|
|
#include "tree-iterator.h"
|
2004-05-13 08:41:07 +02:00
|
|
|
|
#include "diagnostic.h"
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
2003-07-14 22:52:04 +02:00
|
|
|
|
/* The pretty-printer code is primarily designed to closely follow
|
|
|
|
|
(GNU) C and C++ grammars. That is to be contrasted with spaghetti
|
|
|
|
|
codes we used to have in the past. Following a structured
|
2003-08-20 01:22:00 +02:00
|
|
|
|
approach (preferably the official grammars) is believed to make it
|
|
|
|
|
much easier to add extensions and nifty pretty-printing effects that
|
|
|
|
|
takes expression or declaration contexts into account. */
|
2003-07-14 22:52:04 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
|
|
|
|
#define pp_c_maybe_whitespace(PP) \
|
|
|
|
|
do { \
|
|
|
|
|
if (pp_base (PP)->padding == pp_before) \
|
|
|
|
|
pp_c_whitespace (PP); \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
/* literal */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
static void pp_c_char (c_pretty_printer *, int);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
2002-07-30 01:42:26 +02:00
|
|
|
|
/* postfix-expression */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
static void pp_c_initializer_list (c_pretty_printer *, tree);
|
2003-09-18 10:25:12 +02:00
|
|
|
|
static void pp_c_brace_enclosed_initializer_list (c_pretty_printer *, tree);
|
2003-08-25 21:10:50 +02:00
|
|
|
|
|
|
|
|
|
static void pp_c_multiplicative_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_additive_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_shift_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_relational_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_equality_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_and_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_exclusive_or_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_inclusive_or_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_logical_and_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_conditional_expression (c_pretty_printer *, tree);
|
|
|
|
|
static void pp_c_assignment_expression (c_pretty_printer *, tree);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
|
|
|
|
|
/* declarations. */
|
2003-07-25 11:52:32 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
2003-10-05 15:09:48 +02:00
|
|
|
|
/* Helper functions. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_whitespace (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_left_paren (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_left_paren (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_right_paren (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_right_paren (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2003-09-07 20:52:53 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_left_brace (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_left_brace (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_right_brace (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_right_brace (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-31 17:25:51 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_left_bracket (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_left_bracket (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_right_bracket (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_right_bracket (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_dot (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_dot (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_ampersand (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_ampersand (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-31 17:25:51 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_star (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_star (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_arrow (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_arrow (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2004-03-15 11:32:41 +01:00
|
|
|
|
pp_c_semicolon (c_pretty_printer *pp)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
{
|
|
|
|
|
pp_semicolon (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
2004-05-31 17:25:51 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_complement (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_complement (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_exclamation (c_pretty_printer *pp)
|
|
|
|
|
{
|
|
|
|
|
pp_exclamation (pp);
|
|
|
|
|
pp_base (pp)->padding = pp_none;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-15 11:32:41 +01:00
|
|
|
|
/* Print out the external representation of CV-QUALIFIER. */
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_cv_qualifier (c_pretty_printer *pp, const char *cv)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
const char *p = pp_last_position_in_text (pp);
|
2004-03-15 11:32:41 +01:00
|
|
|
|
/* The C programming language does not have references, but it is much
|
|
|
|
|
simpler to handle those here rather than going through the same
|
|
|
|
|
logic in the C++ pretty-printer. */
|
|
|
|
|
if (p != NULL && (*p == '*' || *p == '&'))
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_identifier (pp, cv);
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* Pretty-print T using the type-cast notation '( type-name )'. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_cast (c_pretty_printer *pp, tree t)
|
|
|
|
|
{
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_type_id (pp, t);
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-15 11:32:41 +01:00
|
|
|
|
/* We're about to pretty-print a pointer type as indicated by T.
|
|
|
|
|
Output a whitespace, if needed, preparing for subsequent output. */
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_space_for_pointer_operator (c_pretty_printer *pp, tree t)
|
|
|
|
|
{
|
|
|
|
|
if (POINTER_TYPE_P (t))
|
|
|
|
|
{
|
|
|
|
|
tree pointee = strip_pointer_operator (TREE_TYPE (t));
|
|
|
|
|
if (TREE_CODE (pointee) != ARRAY_TYPE
|
|
|
|
|
&& TREE_CODE (pointee) != FUNCTION_TYPE)
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Declarations. */
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* C++ cv-qualifiers are called type-qualifiers in C. Print out the
|
|
|
|
|
cv-qualifiers of T. If T is a declaration then it is the cv-qualifier
|
|
|
|
|
of its type. Take care of possible extensions.
|
2003-08-25 21:10:50 +02:00
|
|
|
|
|
|
|
|
|
type-qualifier-list:
|
|
|
|
|
type-qualifier
|
|
|
|
|
type-qualifier-list type-qualifier
|
|
|
|
|
|
|
|
|
|
type-qualifier:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
const
|
2003-08-25 21:10:50 +02:00
|
|
|
|
restrict -- C99
|
|
|
|
|
__restrict__ -- GNU C
|
|
|
|
|
volatile */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_qualifier_list (c_pretty_printer *pp, tree t)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
int qualifiers;
|
|
|
|
|
|
|
|
|
|
if (!TYPE_P (t))
|
|
|
|
|
t = TREE_TYPE (t);
|
|
|
|
|
|
|
|
|
|
qualifiers = TYPE_QUALS (t);
|
|
|
|
|
if (qualifiers & TYPE_QUAL_CONST)
|
|
|
|
|
pp_c_cv_qualifier (pp, "const");
|
|
|
|
|
if (qualifiers & TYPE_QUAL_VOLATILE)
|
|
|
|
|
pp_c_cv_qualifier (pp, "volatile");
|
|
|
|
|
if (qualifiers & TYPE_QUAL_RESTRICT)
|
|
|
|
|
pp_c_cv_qualifier (pp, flag_isoc99 ? "restrict" : "__restrict__");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* pointer:
|
|
|
|
|
* type-qualifier-list(opt)
|
|
|
|
|
* type-qualifier-list(opt) pointer */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_pointer (c_pretty_printer *pp, tree t)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
if (!TYPE_P (t) && TREE_CODE (t) != TYPE_DECL)
|
|
|
|
|
t = TREE_TYPE (t);
|
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
|
{
|
|
|
|
|
case POINTER_TYPE:
|
2003-10-05 15:09:48 +02:00
|
|
|
|
/* It is easier to handle C++ reference types here. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
case REFERENCE_TYPE:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (TREE_CODE (TREE_TYPE (t)) == POINTER_TYPE)
|
|
|
|
|
pp_c_pointer (pp, TREE_TYPE (t));
|
2003-08-25 21:10:50 +02:00
|
|
|
|
if (TREE_CODE (t) == POINTER_TYPE)
|
|
|
|
|
pp_c_star (pp);
|
|
|
|
|
else
|
|
|
|
|
pp_c_ampersand (pp);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_type_qualifier_list (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, t);
|
|
|
|
|
}
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* type-specifier:
|
|
|
|
|
void
|
|
|
|
|
char
|
|
|
|
|
short
|
|
|
|
|
int
|
|
|
|
|
long
|
|
|
|
|
float
|
|
|
|
|
double
|
|
|
|
|
signed
|
|
|
|
|
unsigned
|
|
|
|
|
_Bool -- C99
|
|
|
|
|
_Complex -- C99
|
|
|
|
|
_Imaginary -- C99
|
|
|
|
|
struct-or-union-specifier
|
|
|
|
|
enum-specifier
|
|
|
|
|
typedef-name.
|
2003-07-14 22:52:04 +02:00
|
|
|
|
|
|
|
|
|
GNU extensions.
|
|
|
|
|
simple-type-specifier:
|
|
|
|
|
__complex__
|
|
|
|
|
__vector__ */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_type_specifier (c_pretty_printer *pp, tree t)
|
2002-08-12 20:34:51 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
const enum tree_code code = TREE_CODE (t);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case ERROR_MARK:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<type-error>");
|
2002-08-12 20:34:51 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case IDENTIFIER_NODE:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_tree_decl_identifier (pp, t);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-08-12 20:34:51 +02:00
|
|
|
|
case VOID_TYPE:
|
|
|
|
|
case BOOLEAN_TYPE:
|
2002-08-13 03:38:35 +02:00
|
|
|
|
case CHAR_TYPE:
|
|
|
|
|
case INTEGER_TYPE:
|
2002-08-12 20:34:51 +02:00
|
|
|
|
case REAL_TYPE:
|
2003-09-18 10:25:12 +02:00
|
|
|
|
if (TYPE_NAME (t))
|
|
|
|
|
t = TYPE_NAME (t);
|
|
|
|
|
else
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
t = c_common_type_for_mode (TYPE_MODE (t), TYPE_UNSIGNED (t));
|
2003-09-18 10:25:12 +02:00
|
|
|
|
pp_c_type_specifier (pp, t);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TYPE_DECL:
|
2002-08-13 03:38:35 +02:00
|
|
|
|
if (DECL_NAME (t))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_id_expression (pp, t);
|
2002-08-13 03:38:35 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<typedef-error>");
|
2002-08-12 20:34:51 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
if (code == UNION_TYPE)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "union");
|
2002-08-12 20:34:51 +02:00
|
|
|
|
else if (code == RECORD_TYPE)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "struct");
|
2002-08-12 20:34:51 +02:00
|
|
|
|
else if (code == ENUMERAL_TYPE)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "enum");
|
2002-08-13 03:38:35 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<tag-error>");
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-08-12 20:34:51 +02:00
|
|
|
|
if (TYPE_NAME (t))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_id_expression (pp, TYPE_NAME (t));
|
2002-08-12 20:34:51 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<anonymous>");
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-08-12 20:34:51 +02:00
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_unsupported_tree (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
2002-08-12 20:34:51 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-14 22:52:04 +02:00
|
|
|
|
/* specifier-qualifier-list:
|
|
|
|
|
type-specifier specifier-qualifier-list-opt
|
2003-08-25 21:10:50 +02:00
|
|
|
|
type-qualifier specifier-qualifier-list-opt
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Implementation note: Because of the non-linearities in array or
|
2003-08-20 01:22:00 +02:00
|
|
|
|
function declarations, this routine prints not just the
|
2003-08-10 20:17:06 +02:00
|
|
|
|
specifier-qualifier-list of such entities or types of such entities,
|
|
|
|
|
but also the 'pointer' production part of their declarators. The
|
|
|
|
|
remaining part is done by pp_declarator or pp_c_abstract_declarator. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_specifier_qualifier_list (c_pretty_printer *pp, tree t)
|
2002-08-12 20:34:51 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
const enum tree_code code = TREE_CODE (t);
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (TREE_CODE (t) != POINTER_TYPE)
|
|
|
|
|
pp_c_type_qualifier_list (pp, t);
|
2003-08-25 21:10:50 +02:00
|
|
|
|
switch (code)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
case REFERENCE_TYPE:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case POINTER_TYPE:
|
|
|
|
|
{
|
|
|
|
|
/* Get the types-specifier of this type. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
tree pointee = strip_pointer_operator (TREE_TYPE (t));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_specifier_qualifier_list (pp, pointee);
|
|
|
|
|
if (TREE_CODE (pointee) == ARRAY_TYPE
|
|
|
|
|
|| TREE_CODE (pointee) == FUNCTION_TYPE)
|
|
|
|
|
{
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
}
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_ptr_operator (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FUNCTION_TYPE:
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
pp_c_specifier_qualifier_list (pp, TREE_TYPE (t));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case VECTOR_TYPE:
|
|
|
|
|
case COMPLEX_TYPE:
|
|
|
|
|
pp_c_specifier_qualifier_list (pp, TREE_TYPE (t));
|
2003-08-25 21:10:50 +02:00
|
|
|
|
if (code == COMPLEX_TYPE)
|
2003-09-18 10:25:12 +02:00
|
|
|
|
pp_c_identifier (pp, flag_isoc99 ? "_Complex" : "__complex__");
|
2003-08-25 21:10:50 +02:00
|
|
|
|
else if (code == VECTOR_TYPE)
|
2003-09-18 10:25:12 +02:00
|
|
|
|
pp_c_identifier (pp, "__vector__");
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_simple_type_specifier (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2002-08-12 20:34:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* parameter-type-list:
|
|
|
|
|
parameter-list
|
|
|
|
|
parameter-list , ...
|
|
|
|
|
|
|
|
|
|
parameter-list:
|
|
|
|
|
parameter-declaration
|
|
|
|
|
parameter-list , parameter-declaration
|
|
|
|
|
|
|
|
|
|
parameter-declaration:
|
|
|
|
|
declaration-specifiers declarator
|
|
|
|
|
declaration-specifiers abstract-declarator(opt) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_parameter_type_list (c_pretty_printer *pp, tree t)
|
2002-08-12 20:34:51 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
bool want_parm_decl = DECL_P (t) && !(pp->flags & pp_c_flag_abstract);
|
|
|
|
|
tree parms = want_parm_decl ? DECL_ARGUMENTS (t) : TYPE_ARG_TYPES (t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
2003-08-25 21:10:50 +02:00
|
|
|
|
if (parms == void_list_node)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_identifier (pp, "void");
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
bool first = true;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
for ( ; parms && parms != void_list_node; parms = TREE_CHAIN (parms))
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
if (!first)
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
first = false;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_declaration_specifiers
|
|
|
|
|
(pp, want_parm_decl ? parms : TREE_VALUE (parms));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (want_parm_decl)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_declarator (pp, parms);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_abstract_declarator (pp, TREE_VALUE (parms));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* abstract-declarator:
|
|
|
|
|
pointer
|
|
|
|
|
pointer(opt) direct-abstract-declarator */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_abstract_declarator (c_pretty_printer *pp, tree t)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (t) == POINTER_TYPE)
|
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE
|
|
|
|
|
|| TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
t = TREE_TYPE (t);
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_direct_abstract_declarator (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* direct-abstract-declarator:
|
|
|
|
|
( abstract-declarator )
|
|
|
|
|
direct-abstract-declarator(opt) [ assignment-expression(opt) ]
|
|
|
|
|
direct-abstract-declarator(opt) [ * ]
|
|
|
|
|
direct-abstract-declarator(opt) ( parameter-type-list(opt) ) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_direct_abstract_declarator (c_pretty_printer *pp, tree t)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
|
{
|
|
|
|
|
case POINTER_TYPE:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_abstract_declarator (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FUNCTION_TYPE:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_parameter_type_list (pp, t);
|
|
|
|
|
pp_direct_abstract_declarator (pp, TREE_TYPE (t));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
pp_c_left_bracket (pp);
|
|
|
|
|
if (TYPE_DOMAIN (t))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, TYPE_MAX_VALUE (TYPE_DOMAIN (t)));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_right_bracket (pp);
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_direct_abstract_declarator (pp, TREE_TYPE (t));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case IDENTIFIER_NODE:
|
|
|
|
|
case VOID_TYPE:
|
|
|
|
|
case BOOLEAN_TYPE:
|
|
|
|
|
case INTEGER_TYPE:
|
|
|
|
|
case REAL_TYPE:
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case VECTOR_TYPE:
|
|
|
|
|
case COMPLEX_TYPE:
|
|
|
|
|
case TYPE_DECL:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* type-name:
|
|
|
|
|
specifier-qualifier-list abstract-declarator(opt) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_id (c_pretty_printer *pp, tree t)
|
2002-08-12 20:34:51 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_specifier_qualifier_list (pp, t);
|
|
|
|
|
pp_abstract_declarator (pp, t);
|
2002-08-12 20:34:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* storage-class-specifier:
|
|
|
|
|
typedef
|
|
|
|
|
extern
|
|
|
|
|
static
|
|
|
|
|
auto
|
|
|
|
|
register */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_storage_class_specifier (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (t) == TYPE_DECL)
|
|
|
|
|
pp_c_identifier (pp, "typedef");
|
2003-08-10 20:17:06 +02:00
|
|
|
|
else if (DECL_P (t))
|
|
|
|
|
{
|
|
|
|
|
if (DECL_REGISTER (t))
|
|
|
|
|
pp_c_identifier (pp, "register");
|
|
|
|
|
else if (TREE_STATIC (t) && TREE_CODE (t) == VAR_DECL)
|
|
|
|
|
pp_c_identifier (pp, "static");
|
|
|
|
|
}
|
2002-08-13 03:38:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* function-specifier:
|
|
|
|
|
inline */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_function_specifier (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (t) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (t))
|
|
|
|
|
pp_c_identifier (pp, "inline");
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* declaration-specifiers:
|
|
|
|
|
storage-class-specifier declaration-specifiers(opt)
|
|
|
|
|
type-specifier declaration-specifiers(opt)
|
|
|
|
|
type-qualifier declaration-specifiers(opt)
|
|
|
|
|
function-specifier declaration-specifiers(opt) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_declaration_specifiers (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_storage_class_specifier (pp, t);
|
|
|
|
|
pp_function_specifier (pp, t);
|
|
|
|
|
pp_c_specifier_qualifier_list (pp, DECL_P (t) ? TREE_TYPE (t) : t);
|
2002-08-13 03:38:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* direct-declarator
|
|
|
|
|
identifier
|
|
|
|
|
( declarator )
|
|
|
|
|
direct-declarator [ type-qualifier-list(opt) assignment-expression(opt) ]
|
|
|
|
|
direct-declarator [ static type-qualifier-list(opt) assignment-expression(opt)]
|
2003-10-05 21:50:56 +02:00
|
|
|
|
direct-declarator [ type-qualifier-list static assignment-expression ]
|
2003-08-10 20:17:06 +02:00
|
|
|
|
direct-declarator [ type-qualifier-list * ]
|
2004-01-31 18:47:43 +01:00
|
|
|
|
direct-declarator ( parameter-type-list )
|
2003-08-10 20:17:06 +02:00
|
|
|
|
direct-declarator ( identifier-list(opt) ) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_direct_declarator (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
|
{
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
case TYPE_DECL:
|
|
|
|
|
case FIELD_DECL:
|
|
|
|
|
case LABEL_DECL:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_space_for_pointer_operator (pp, TREE_TYPE (t));
|
|
|
|
|
pp_c_tree_decl_identifier (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
case POINTER_TYPE:
|
|
|
|
|
pp_abstract_declarator (pp, TREE_TYPE (t));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FUNCTION_TYPE:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_parameter_list (pp, t);
|
|
|
|
|
pp_abstract_declarator (pp, TREE_TYPE (t));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FUNCTION_DECL:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_space_for_pointer_operator (pp, TREE_TYPE (TREE_TYPE (t)));
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_tree_decl_identifier (pp, t);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (pp_c_base (pp)->flags & pp_c_flag_abstract)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_abstract_declarator (pp, TREE_TYPE (t));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_parameter_list (pp, t);
|
|
|
|
|
pp_abstract_declarator (pp, TREE_TYPE (TREE_TYPE (t)));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case INTEGER_TYPE:
|
|
|
|
|
case REAL_TYPE:
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-08-13 03:38:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
|
|
|
|
/* declarator:
|
|
|
|
|
pointer(opt) direct-declarator */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_declarator (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
|
{
|
|
|
|
|
case INTEGER_TYPE:
|
|
|
|
|
case REAL_TYPE:
|
|
|
|
|
case ENUMERAL_TYPE:
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
case FIELD_DECL:
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
case FUNCTION_TYPE:
|
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
case TYPE_DECL:
|
|
|
|
|
pp_direct_declarator (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-08-13 03:38:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* declaration:
|
|
|
|
|
declaration-specifiers init-declarator-list(opt) ; */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-08-13 03:38:35 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_declaration (c_pretty_printer *pp, tree t)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
|
|
|
|
pp_declaration_specifiers (pp, t);
|
|
|
|
|
pp_c_init_declarator (pp, t);
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-14 05:22:18 +02:00
|
|
|
|
/* Pretty-print ATTRIBUTES using GNU C extension syntax. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-06-22 15:41:26 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_attributes (c_pretty_printer *pp, tree attributes)
|
2002-08-14 05:22:18 +02:00
|
|
|
|
{
|
|
|
|
|
if (attributes == NULL_TREE)
|
|
|
|
|
return;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-08-14 05:22:18 +02:00
|
|
|
|
pp_c_identifier (pp, "__attribute__");
|
2003-06-22 15:41:26 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
2002-08-14 05:22:18 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
for (; attributes != NULL_TREE; attributes = TREE_CHAIN (attributes))
|
|
|
|
|
{
|
|
|
|
|
pp_tree_identifier (pp, TREE_PURPOSE (attributes));
|
|
|
|
|
if (TREE_VALUE (attributes))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_call_argument_list (pp, TREE_VALUE (attributes));
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-08-14 05:22:18 +02:00
|
|
|
|
if (TREE_CHAIN (attributes))
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
}
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* function-definition:
|
|
|
|
|
declaration-specifiers declarator compound-statement */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_function_definition (c_pretty_printer *pp, tree t)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
pp_declaration_specifiers (pp, t);
|
|
|
|
|
pp_declarator (pp, t);
|
|
|
|
|
pp_needs_newline (pp) = true;
|
|
|
|
|
pp_statement (pp, DECL_SAVED_TREE (t));
|
|
|
|
|
pp_newline (pp);
|
|
|
|
|
pp_flush (pp);
|
|
|
|
|
}
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
|
|
|
|
/* Expressions. */
|
|
|
|
|
|
|
|
|
|
/* Print out a c-char. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_char (c_pretty_printer *pp, int c)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case TARGET_NEWLINE:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\n");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_TAB:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\t");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_VT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\v");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_BS:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\b");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_CR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\r");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_FF:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\f");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case TARGET_BELL:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\a");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case '\\':
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\\\");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case '\'':
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\'");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
case '\"':
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_string (pp, "\\\"");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (ISPRINT (c))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_character (pp, c);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_scalar (pp, "\\%03o", (unsigned) c);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print out a STRING literal. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-05 21:23:14 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_string_literal (c_pretty_printer *pp, tree s)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
const char *p = TREE_STRING_POINTER (s);
|
|
|
|
|
int n = TREE_STRING_LENGTH (s) - 1;
|
|
|
|
|
int i;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_doublequote (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
for (i = 0; i < n; ++i)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_char (pp, p[i]);
|
|
|
|
|
pp_doublequote (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2004-03-15 11:32:41 +01:00
|
|
|
|
/* Pretty-print an INTEGER literal. */
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_integer_constant (c_pretty_printer *pp, tree i)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
2003-09-18 10:25:12 +02:00
|
|
|
|
tree type = TREE_TYPE (i);
|
|
|
|
|
|
|
|
|
|
if (TREE_INT_CST_HIGH (i) == 0)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_wide_integer (pp, TREE_INT_CST_LOW (i));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (tree_int_cst_sgn (i) < 0)
|
|
|
|
|
{
|
|
|
|
|
pp_c_char (pp, '-');
|
|
|
|
|
i = build_int_2 (-TREE_INT_CST_LOW (i),
|
|
|
|
|
~TREE_INT_CST_HIGH (i) + !TREE_INT_CST_LOW (i));
|
|
|
|
|
}
|
|
|
|
|
sprintf (pp_buffer (pp)->digit_buffer,
|
|
|
|
|
HOST_WIDE_INT_PRINT_DOUBLE_HEX,
|
|
|
|
|
TREE_INT_CST_HIGH (i), TREE_INT_CST_LOW (i));
|
|
|
|
|
pp_string (pp, pp_buffer (pp)->digit_buffer);
|
|
|
|
|
}
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (TYPE_UNSIGNED (type))
|
2003-09-18 10:25:12 +02:00
|
|
|
|
pp_character (pp, 'u');
|
|
|
|
|
if (type == long_integer_type_node || type == long_unsigned_type_node)
|
|
|
|
|
pp_character (pp, 'l');
|
|
|
|
|
else if (type == long_long_integer_type_node
|
|
|
|
|
|| type == long_long_unsigned_type_node)
|
|
|
|
|
pp_string (pp, "ll");
|
2003-08-10 20:17:06 +02:00
|
|
|
|
}
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
/* Print out a CHARACTER literal. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_character_constant (c_pretty_printer *pp, tree c)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-05 21:23:14 +02:00
|
|
|
|
tree type = TREE_TYPE (c);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (type == wchar_type_node)
|
|
|
|
|
pp_character (pp, 'L');
|
|
|
|
|
pp_quote (pp);
|
builtins.c, [...]: Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* builtins.c, c-aux-info.c, c-common.c, c-cppbuiltin.c, c-decl.c:
Change most occurrences of TREE_UNSIGNED to TYPE_UNSIGNED.
* c-format.c, c-opts.c, c-pretty-print.c, c-typeck.c: Likewise.
* calls.c, convert.c, dbxout.c, dojump.c, dwarf2out.c: Likewise.
* expmed.c, expr.c, fold-const.c, function.c, integrate.c: Likewise.
* optabs.c, sdbout.c, stmt.c, stor-layout.c, tree-dump.c: Likewise.
* tree.c, config/iq2000/iq2000.c, config/m32r/m32r.c: Likewise.
* config/mips/mips.c, config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c, config/sparc/sparc.c, objc/objc-act.c: Likewise.
* stor-layout.c (layout_type, case COMPLEX_TYPE): Test for
REAL_TYPE, not INTEGER_TYPE.
(layout_type, case VECTOR_TYPE): Simplify code.
* tree.c (build_vector_type_for_mode): Remove dup unsigned setting.
* tree.h: Update comments.
(STRIP_NOPS): Use TYPE_UNSIGNED.
(TYPE_UNSIGNED): New macro.
(TYPE_TRAP_SIGNED): Remove now redundant check.
(SAVE_EXPR_NOPLACEHOLDER): Don't use TREE_UNSIGNED.
* cp/call.c (joust): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* cp/class.c (check_bitfield_decl): Likewise.
* cp/cvt.c (type_promotes_to): Likewise.
* cp/decl.c (finish_enum): Likewise.
* cp/mangle.c (write_builtin_type): Likewise.
* cp/semantics.c (finish_switch_cond, finish_unary_op_expr): Likewise.
* cp/typeck.c (type_after_usual_arithmetic_conversions): Likewise.
(build_binary_op): Likewise.
* f/com.c (ffecom_arrayref_): Use TYPE_UNSIGNED, not TREE_UNSIGNED.
(ffecom_expr_): Likewise.
* java/jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED.
* treelang/treetree.c (tree_lang_signed_or_unsigned_type):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/decl.c (gnat_to_gnu_entity, make_type_from_size):
Use TYPE_UNSIGNED, not TREE_UNSIGNED.
* ada/trans.c (tree_transform, convert_with_check): Likewise.
* ada/utils.c (gnat_signed_or_unsigned_type): Likewise.
(build_vms_descriptor, unchecked_convert): Likewise.
* ada/utils2.c (nonbinary_modular_operation): Likewise.
From-SVN: r80287
2004-04-01 05:50:43 +02:00
|
|
|
|
if (host_integerp (c, TYPE_UNSIGNED (type)))
|
|
|
|
|
pp_c_char (pp, tree_low_cst (c, TYPE_UNSIGNED (type)));
|
2003-08-05 21:23:14 +02:00
|
|
|
|
else
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_scalar (pp, "\\x%x", (unsigned) TREE_INT_CST_LOW (c));
|
|
|
|
|
pp_quote (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print out a BOOLEAN literal. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_bool_constant (c_pretty_printer *pp, tree b)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (b == boolean_false_node)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove.
(fix_string_type, check_case_value, c_common_nodes_and_builtins,
c_add_case_label, finish_label_addr_expr, boolean_increment):
Use c_dialect_ macros.
* c-common.h (enum c_language_kind): Extend.
(c_dialect_cxx, c_dialect_objc): New.
(flag_objc): Remove.
(c_common_init_options): Update prototype.
* c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_
macros.
* c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_
macros.
* c-format.c (C_STD_VER, C_STD_NAME): Similarly.
* c-lang.c (c_init_options): Remove.
(c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* c-lex.c (lex_charconst): Use c_dialect_cxx().
* c-opts.c (lang_flags): Make function-local.
(c_common_init_options): Use c_dialect_ macros. Handle
C++ diagnostic requirements.
(c_common_handle_option, c_common_post_options): Use flag_cxx.
* c-parse.in (init_reswords): Use c_dialect_objc ().
* c-pch.c (get_ident): Use c_language.
* c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros.
* c-typeck.c (comptypes, build_c_cast): Similarly.
* objc/objc-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
(objc_init_options): Remove.
cp:
* Make-lang.in: Update.
* cp-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* cp-tree.h (cxx_init_options): Remove.
* lex.c: Don't include diagnostic.h.
(cxx_init_options): Remove.
From-SVN: r68734
2003-06-30 21:36:25 +02:00
|
|
|
|
if (c_dialect_cxx ())
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_identifier (pp, "false");
|
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove.
(fix_string_type, check_case_value, c_common_nodes_and_builtins,
c_add_case_label, finish_label_addr_expr, boolean_increment):
Use c_dialect_ macros.
* c-common.h (enum c_language_kind): Extend.
(c_dialect_cxx, c_dialect_objc): New.
(flag_objc): Remove.
(c_common_init_options): Update prototype.
* c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_
macros.
* c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_
macros.
* c-format.c (C_STD_VER, C_STD_NAME): Similarly.
* c-lang.c (c_init_options): Remove.
(c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* c-lex.c (lex_charconst): Use c_dialect_cxx().
* c-opts.c (lang_flags): Make function-local.
(c_common_init_options): Use c_dialect_ macros. Handle
C++ diagnostic requirements.
(c_common_handle_option, c_common_post_options): Use flag_cxx.
* c-parse.in (init_reswords): Use c_dialect_objc ().
* c-pch.c (get_ident): Use c_language.
* c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros.
* c-typeck.c (comptypes, build_c_cast): Similarly.
* objc/objc-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
(objc_init_options): Remove.
cp:
* Make-lang.in: Update.
* cp-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* cp-tree.h (cxx_init_options): Remove.
* lex.c: Don't include diagnostic.h.
(cxx_init_options): Remove.
From-SVN: r68734
2003-06-30 21:36:25 +02:00
|
|
|
|
else if (flag_isoc99)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_identifier (pp, "_False");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_unsupported_tree (pp, b);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else if (b == boolean_true_node)
|
|
|
|
|
{
|
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove.
(fix_string_type, check_case_value, c_common_nodes_and_builtins,
c_add_case_label, finish_label_addr_expr, boolean_increment):
Use c_dialect_ macros.
* c-common.h (enum c_language_kind): Extend.
(c_dialect_cxx, c_dialect_objc): New.
(flag_objc): Remove.
(c_common_init_options): Update prototype.
* c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_
macros.
* c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_
macros.
* c-format.c (C_STD_VER, C_STD_NAME): Similarly.
* c-lang.c (c_init_options): Remove.
(c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* c-lex.c (lex_charconst): Use c_dialect_cxx().
* c-opts.c (lang_flags): Make function-local.
(c_common_init_options): Use c_dialect_ macros. Handle
C++ diagnostic requirements.
(c_common_handle_option, c_common_post_options): Use flag_cxx.
* c-parse.in (init_reswords): Use c_dialect_objc ().
* c-pch.c (get_ident): Use c_language.
* c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros.
* c-typeck.c (comptypes, build_c_cast): Similarly.
* objc/objc-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
(objc_init_options): Remove.
cp:
* Make-lang.in: Update.
* cp-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* cp-tree.h (cxx_init_options): Remove.
* lex.c: Don't include diagnostic.h.
(cxx_init_options): Remove.
From-SVN: r68734
2003-06-30 21:36:25 +02:00
|
|
|
|
if (c_dialect_cxx ())
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_identifier (pp, "true");
|
c-common.c (enum c_language_kind, flag_objc): Remove.
* c-common.c (enum c_language_kind, flag_objc): Remove.
(fix_string_type, check_case_value, c_common_nodes_and_builtins,
c_add_case_label, finish_label_addr_expr, boolean_increment):
Use c_dialect_ macros.
* c-common.h (enum c_language_kind): Extend.
(c_dialect_cxx, c_dialect_objc): New.
(flag_objc): Remove.
(c_common_init_options): Update prototype.
* c-cppbuiltin.c (define__GNUC__, c_cpp_builtins): Use c_dialect_
macros.
* c-decl.c (finsih_decl, grokfield, finish_struct): Use c_dialect_
macros.
* c-format.c (C_STD_VER, C_STD_NAME): Similarly.
* c-lang.c (c_init_options): Remove.
(c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* c-lex.c (lex_charconst): Use c_dialect_cxx().
* c-opts.c (lang_flags): Make function-local.
(c_common_init_options): Use c_dialect_ macros. Handle
C++ diagnostic requirements.
(c_common_handle_option, c_common_post_options): Use flag_cxx.
* c-parse.in (init_reswords): Use c_dialect_objc ().
* c-pch.c (get_ident): Use c_language.
* c-pretty-print.c (pp_c_bool_literal): Use c_dialect_ macros.
* c-typeck.c (comptypes, build_c_cast): Similarly.
* objc/objc-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
(objc_init_options): Remove.
cp:
* Make-lang.in: Update.
* cp-lang.c (c_language): Define.
(LANG_HOOKS_INIT_OPTIONS): Use common hook.
* cp-tree.h (cxx_init_options): Remove.
* lex.c: Don't include diagnostic.h.
(cxx_init_options): Remove.
From-SVN: r68734
2003-06-30 21:36:25 +02:00
|
|
|
|
else if (flag_isoc99)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_identifier (pp, "_True");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_unsupported_tree (pp, b);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
2003-08-10 20:17:06 +02:00
|
|
|
|
else if (TREE_CODE (b) == INTEGER_CST)
|
|
|
|
|
pp_c_integer_constant (pp, b);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_unsupported_tree (pp, b);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-06-22 15:41:26 +02:00
|
|
|
|
/* Attempt to print out an ENUMERATOR. Return true on success. Else return
|
2002-07-29 21:31:24 +02:00
|
|
|
|
false; that means the value was obtained by a cast, in which case
|
|
|
|
|
print out the type-id part of the cast-expression -- the casted value
|
|
|
|
|
is then printed by pp_c_integer_literal. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static bool
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_enumeration_constant (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
bool value_is_named = true;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
tree type = TREE_TYPE (e);
|
|
|
|
|
tree value;
|
|
|
|
|
|
|
|
|
|
/* Find the name of this constant. */
|
2003-06-22 15:41:26 +02:00
|
|
|
|
for (value = TYPE_VALUES (type);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
value != NULL_TREE && !tree_int_cst_equal (TREE_VALUE (value), e);
|
|
|
|
|
value = TREE_CHAIN (value))
|
|
|
|
|
;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (value != NULL_TREE)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_id_expression (pp, TREE_PURPOSE (value));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Value must have been cast. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_cast (pp, type);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
value_is_named = false;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
return value_is_named;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-17 19:56:42 +02:00
|
|
|
|
/* Print out a REAL value as a decimal-floating-constant. */
|
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_floating_constant (c_pretty_printer *pp, tree r)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
real_to_decimal (pp_buffer (pp)->digit_buffer, &TREE_REAL_CST (r),
|
|
|
|
|
sizeof (pp_buffer (pp)->digit_buffer), 0, 1);
|
|
|
|
|
pp_string (pp, pp_buffer(pp)->digit_buffer);
|
2003-09-17 19:56:42 +02:00
|
|
|
|
if (TREE_TYPE (r) == float_type_node)
|
|
|
|
|
pp_character (pp, 'f');
|
|
|
|
|
else if (TREE_TYPE (r) == long_double_type_node)
|
|
|
|
|
pp_character (pp, 'l');
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-09-18 10:25:12 +02:00
|
|
|
|
/* Pretty-print a compound literal expression. GNU extensions include
|
|
|
|
|
vector constants. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pp_c_compound_literal (c_pretty_printer *pp, tree e)
|
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (e);
|
|
|
|
|
pp_c_type_cast (pp, type);
|
|
|
|
|
|
|
|
|
|
switch (TREE_CODE (type))
|
|
|
|
|
{
|
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
case VECTOR_TYPE:
|
|
|
|
|
case COMPLEX_TYPE:
|
|
|
|
|
pp_c_brace_enclosed_initializer_list (pp, e);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, e);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* constant:
|
|
|
|
|
integer-constant
|
|
|
|
|
floating-constant
|
|
|
|
|
enumeration-constant
|
2003-10-05 21:50:56 +02:00
|
|
|
|
character-constant */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_constant (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-09-18 10:25:12 +02:00
|
|
|
|
const enum tree_code code = TREE_CODE (e);
|
|
|
|
|
|
|
|
|
|
switch (code)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
case INTEGER_CST:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (e);
|
|
|
|
|
if (type == boolean_type_node)
|
|
|
|
|
pp_c_bool_constant (pp, e);
|
|
|
|
|
else if (type == char_type_node)
|
|
|
|
|
pp_c_character_constant (pp, e);
|
|
|
|
|
else if (TREE_CODE (type) == ENUMERAL_TYPE
|
|
|
|
|
&& pp_c_enumeration_constant (pp, e))
|
|
|
|
|
;
|
|
|
|
|
else
|
|
|
|
|
pp_c_integer_constant (pp, e);
|
|
|
|
|
}
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case REAL_CST:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_floating_constant (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case STRING_CST:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_c_string_literal (pp, e);
|
2003-06-22 15:41:26 +02:00
|
|
|
|
break;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
|
|
|
|
default:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp_unsupported_tree (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
c-common.c, [...]: Fix comment typos.
* c-common.c, cfgcleanup.c, cgraphunit.c, c-pretty-print.c,
expmed.c, ggc-common.c, jump.c, passes.c, recog.c, regmove.c,
reorg.c, tree.h: Fix comment typos.
From-SVN: r79730
2004-03-20 06:21:41 +01:00
|
|
|
|
/* Pretty-print an IDENTIFIER_NODE, preceded by whitespace is necessary. */
|
2004-03-15 11:32:41 +01:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (c_pretty_printer *pp, const char *id)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
pp_c_maybe_whitespace (pp);
|
|
|
|
|
pp_identifier (pp, id);
|
|
|
|
|
pp_base (pp)->padding = pp_before;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pretty-print a C primary-expression.
|
|
|
|
|
primary-expression:
|
|
|
|
|
identifier
|
|
|
|
|
constant
|
|
|
|
|
string-literal
|
|
|
|
|
( expression ) */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_primary_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (e))
|
|
|
|
|
{
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
case FIELD_DECL:
|
|
|
|
|
case CONST_DECL:
|
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
case LABEL_DECL:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_tree_decl_identifier (pp, e);
|
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case IDENTIFIER_NODE:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_tree_identifier (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ERROR_MARK:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<erroneous-expression>");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case RESULT_DECL:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "<return-value>");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case INTEGER_CST:
|
|
|
|
|
case REAL_CST:
|
|
|
|
|
case STRING_CST:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_constant (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
|
case TARGET_EXPR:
|
|
|
|
|
pp_c_identifier (pp, "__builtin_memcpy");
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_ampersand (pp);
|
|
|
|
|
pp_primary_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
pp_ampersand (pp);
|
|
|
|
|
pp_initializer (pp, TREE_OPERAND (e, 1));
|
|
|
|
|
if (TREE_OPERAND (e, 2))
|
|
|
|
|
{
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
pp_c_expression (pp, TREE_OPERAND (e, 2));
|
|
|
|
|
}
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
break;
|
|
|
|
|
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case STMT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_statement (pp, STMT_EXPR_STMT (e));
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-07-30 08:34:57 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
default:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* FIXME: Make sure we won't get into an infinie loop. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, e);
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* Print out a C initializer -- also support C compound-literals.
|
|
|
|
|
initializer:
|
|
|
|
|
assignment-expression:
|
|
|
|
|
{ initializer-list }
|
|
|
|
|
{ initializer-list , } */
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
static void
|
|
|
|
|
pp_c_initializer (c_pretty_printer *pp, tree e)
|
2002-07-30 01:42:26 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == CONSTRUCTOR)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_brace_enclosed_initializer_list (pp, e);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, e);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* init-declarator:
|
|
|
|
|
declarator:
|
|
|
|
|
declarator = initializer */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_init_declarator (c_pretty_printer *pp, tree t)
|
|
|
|
|
{
|
|
|
|
|
pp_declarator (pp, t);
|
2004-03-15 11:32:41 +01:00
|
|
|
|
/* We don't want to output function definitions here. There are handled
|
|
|
|
|
elsewhere (and the syntactic form is bogus anyway). */
|
|
|
|
|
if (TREE_CODE (t) != FUNCTION_DECL && DECL_INITIAL (t))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
{
|
|
|
|
|
tree init = DECL_INITIAL (t);
|
|
|
|
|
/* This C++ bit is handled here because it is easier to do so.
|
|
|
|
|
In templates, the C++ parser builds a TREE_LIST for a
|
|
|
|
|
direct-initialization; the TREE_PURPOSE is the variable to
|
|
|
|
|
initialize and the TREE_VALUE is the initializer. */
|
|
|
|
|
if (TREE_CODE (init) == TREE_LIST)
|
|
|
|
|
{
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, TREE_VALUE (init));
|
|
|
|
|
pp_right_paren (pp);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_equal (pp);
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_initializer (pp, init);
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-07-30 01:42:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* initializer-list:
|
|
|
|
|
designation(opt) initializer
|
|
|
|
|
initializer-list , designation(opt) initializer
|
|
|
|
|
|
|
|
|
|
designation:
|
|
|
|
|
designator-list =
|
|
|
|
|
|
|
|
|
|
designator-list:
|
|
|
|
|
designator
|
|
|
|
|
designator-list designator
|
|
|
|
|
|
|
|
|
|
designator:
|
|
|
|
|
[ constant-expression ]
|
|
|
|
|
identifier */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-30 01:42:26 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_initializer_list (c_pretty_printer *pp, tree e)
|
2002-07-30 01:42:26 +02:00
|
|
|
|
{
|
|
|
|
|
tree type = TREE_TYPE (e);
|
|
|
|
|
const enum tree_code code = TREE_CODE (type);
|
|
|
|
|
|
2003-09-18 10:25:12 +02:00
|
|
|
|
switch (code)
|
2002-07-30 01:42:26 +02:00
|
|
|
|
{
|
2003-09-18 10:25:12 +02:00
|
|
|
|
case RECORD_TYPE:
|
|
|
|
|
case UNION_TYPE:
|
|
|
|
|
case ARRAY_TYPE:
|
|
|
|
|
{
|
|
|
|
|
tree init = TREE_OPERAND (e, 0);
|
|
|
|
|
for (; init != NULL_TREE; init = TREE_CHAIN (init))
|
|
|
|
|
{
|
|
|
|
|
if (code == RECORD_TYPE || code == UNION_TYPE)
|
|
|
|
|
{
|
|
|
|
|
pp_c_dot (pp);
|
|
|
|
|
pp_c_primary_expression (pp, TREE_PURPOSE (init));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
pp_c_left_bracket (pp);
|
|
|
|
|
if (TREE_PURPOSE (init))
|
|
|
|
|
pp_c_constant (pp, TREE_PURPOSE (init));
|
|
|
|
|
pp_c_right_bracket (pp);
|
|
|
|
|
}
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_equal (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_initializer (pp, TREE_VALUE (init));
|
|
|
|
|
if (TREE_CHAIN (init))
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
return;
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
|
|
|
|
case VECTOR_TYPE:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (TREE_CODE (e) == VECTOR_CST)
|
|
|
|
|
pp_c_expression_list (pp, TREE_VECTOR_CST_ELTS (e));
|
|
|
|
|
else if (TREE_CODE (e) == CONSTRUCTOR)
|
|
|
|
|
pp_c_expression_list (pp, CONSTRUCTOR_ELTS (e));
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
return;
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
|
|
|
|
case COMPLEX_TYPE:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
if (TREE_CODE (e) == CONSTRUCTOR)
|
|
|
|
|
pp_c_expression_list (pp, CONSTRUCTOR_ELTS (e));
|
|
|
|
|
else if (TREE_CODE (e) == COMPLEX_CST || TREE_CODE (e) == COMPLEX_EXPR)
|
|
|
|
|
{
|
|
|
|
|
const bool cst = TREE_CODE (e) == COMPLEX_CST;
|
|
|
|
|
pp_expression (pp, cst ? TREE_REALPART (e) : TREE_OPERAND (e, 0));
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
pp_expression (pp, cst ? TREE_IMAGPART (e) : TREE_OPERAND (e, 1));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
return;
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
2002-07-30 01:42:26 +02:00
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
pp_unsupported_tree (pp, type);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-12-21 15:08:35 +01:00
|
|
|
|
/* Pretty-print a brace-enclosed initializer-list. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pp_c_brace_enclosed_initializer_list (c_pretty_printer *pp, tree l)
|
|
|
|
|
{
|
|
|
|
|
pp_c_left_brace (pp);
|
|
|
|
|
pp_c_initializer_list (pp, l);
|
|
|
|
|
pp_c_right_brace (pp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* This is a convenient function, used to bridge gap between C and C++
|
|
|
|
|
grammars.
|
|
|
|
|
|
|
|
|
|
id-expression:
|
|
|
|
|
identifier */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_id_expression (c_pretty_printer *pp, tree t)
|
2003-08-10 20:17:06 +02:00
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
|
{
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
case CONST_DECL:
|
|
|
|
|
case TYPE_DECL:
|
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
case FIELD_DECL:
|
|
|
|
|
case LABEL_DECL:
|
2004-05-13 08:41:07 +02:00
|
|
|
|
pp_c_tree_decl_identifier (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case IDENTIFIER_NODE:
|
|
|
|
|
pp_c_tree_identifier (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
pp_unsupported_tree (pp, t);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* postfix-expression:
|
|
|
|
|
primary-expression
|
|
|
|
|
postfix-expression [ expression ]
|
|
|
|
|
postfix-expression ( argument-expression-list(opt) )
|
|
|
|
|
postfix-expression . identifier
|
|
|
|
|
postfix-expression -> identifier
|
|
|
|
|
postfix-expression ++
|
|
|
|
|
postfix-expression --
|
|
|
|
|
( type-name ) { initializer-list }
|
|
|
|
|
( type-name ) { initializer-list , } */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_postfix_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case POSTINCREMENT_EXPR:
|
|
|
|
|
case POSTDECREMENT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_identifier (pp, code == POSTINCREMENT_EXPR ? "++" : "--");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case ARROW_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_arrow (pp);
|
2002-07-30 08:34:57 +02:00
|
|
|
|
break;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
|
|
|
|
case ARRAY_REF:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_left_bracket (pp);
|
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 1));
|
|
|
|
|
pp_c_right_bracket (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case CALL_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_call_argument_list (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case ABS_EXPR:
|
tree.def (FFS_EXPR, [...]): Delete unused tree codes.
* tree.def (FFS_EXPR, CLZ_EXPR, CTZ_EXPR, POPCOUNT_EXPR,
PARITY_EXPR): Delete unused tree codes.
* c-common.c (c_common_truthvalue_conversion): Delete references
to FFS_EXPR and POPCOUNT_EXPR.
* c-pretty-print.c (pp_c_postfix_expression): Remove FFS_EXPR.
(pp_c_expression): Likewise.
* expr.c (expand_expr): Delete RTL expansion of FFS_EXPR, CLZ_EXPR,
CTZ_EXPR, POPCOUNT_EXPR and PARITY_EXPR.
* fold-const.c (tree_expr_nonnegative_p): Remove FFS_EXPR, CLZ_EXPR,
CTZ_EXPR, POPCOUNT_EXPR and PARITY_EXPR. Add support for calls to
BUILT_IN_FFS, BUILT_IN_PARITY and BUILT_IN_POPCOUNT and their long
and long long variants.
* cp/lex.c (init_operators): Remove operator_name_info for FFS_EXPR.
* cp/class.c (instantiate_type): Remove FFS_EXPR case.
* f/com.c (ffecom_overlap_): Remove FFS_EXPR case.
(ffecom_tree_canonize_ref_): Likewise.
(ffe_truthvalue_conversion): Likewise.
* java/expr.c (java_truthvalue_conversion): Remove FFS_EXPR case.
* java/check-init.c (check_init): Likewise.
From-SVN: r71525
2003-09-18 17:06:02 +02:00
|
|
|
|
pp_c_identifier (pp, "__builtin_abs");
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case COMPONENT_REF:
|
|
|
|
|
{
|
|
|
|
|
tree object = TREE_OPERAND (e, 0);
|
|
|
|
|
if (TREE_CODE (object) == INDIRECT_REF)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (object, 0));
|
|
|
|
|
pp_c_arrow (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, object);
|
|
|
|
|
pp_c_dot (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COMPLEX_CST:
|
|
|
|
|
case VECTOR_CST:
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case COMPLEX_EXPR:
|
2003-09-18 10:25:12 +02:00
|
|
|
|
pp_c_compound_literal (pp, e);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case COMPOUND_LITERAL_EXPR:
|
2003-10-08 20:13:53 +02:00
|
|
|
|
e = DECL_INITIAL (COMPOUND_LITERAL_EXPR_DECL (e));
|
2002-07-30 08:34:57 +02:00
|
|
|
|
/* Fall through. */
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case CONSTRUCTOR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_initializer (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case VA_ARG_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "__builtin_va_arg");
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_assignment_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
pp_type_id (pp, TREE_TYPE (e));
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-07-30 08:34:57 +02:00
|
|
|
|
break;
|
2002-07-29 21:31:24 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
if (TREE_CODE (TREE_OPERAND (e, 0)) == FUNCTION_DECL)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_id_expression (pp, TREE_OPERAND (e, 0));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2003-08-22 08:25:09 +02:00
|
|
|
|
/* else fall through. */
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_primary_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-12-21 15:08:35 +01:00
|
|
|
|
/* Print out an expression-list; E is expected to be a TREE_LIST. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_expression_list (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
for (; e != NULL_TREE; e = TREE_CHAIN (e))
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, TREE_VALUE (e));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (TREE_CHAIN (e))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_separate_with (pp, ',');
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-12-21 15:08:35 +01:00
|
|
|
|
/* Print out an expression-list in parens, as in a function call. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
void
|
|
|
|
|
pp_c_call_argument_list (c_pretty_printer *pp, tree t)
|
|
|
|
|
{
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
if (t && TREE_CODE (t) == TREE_LIST)
|
|
|
|
|
pp_c_expression_list (pp, t);
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
}
|
|
|
|
|
|
2003-07-14 22:52:04 +02:00
|
|
|
|
/* unary-expression:
|
|
|
|
|
postfix-expression
|
|
|
|
|
++ cast-expression
|
|
|
|
|
-- cast-expression
|
|
|
|
|
unary-operator cast-expression
|
|
|
|
|
sizeof unary-expression
|
|
|
|
|
sizeof ( type-id )
|
|
|
|
|
|
|
|
|
|
unary-operator: one of
|
|
|
|
|
* & + - ! ~
|
|
|
|
|
|
|
|
|
|
GNU extensions.
|
|
|
|
|
unary-expression:
|
|
|
|
|
__alignof__ unary-expression
|
|
|
|
|
__alignof__ ( type-id )
|
|
|
|
|
__real__ unary-expression
|
|
|
|
|
__imag__ unary-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_unary_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case PREINCREMENT_EXPR:
|
|
|
|
|
case PREDECREMENT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_identifier (pp, code == PREINCREMENT_EXPR ? "++" : "--");
|
|
|
|
|
pp_c_unary_expression (pp, TREE_OPERAND (e, 0));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
case INDIRECT_REF:
|
|
|
|
|
case NEGATE_EXPR:
|
|
|
|
|
case BIT_NOT_EXPR:
|
|
|
|
|
case TRUTH_NOT_EXPR:
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case CONJ_EXPR:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
/* String literal are used by address. */
|
|
|
|
|
if (code == ADDR_EXPR && TREE_CODE (TREE_OPERAND (e, 0)) != STRING_CST)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_ampersand (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == INDIRECT_REF)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_star (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == NEGATE_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_minus (pp);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
else if (code == BIT_NOT_EXPR || code == CONJ_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_complement (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == TRUTH_NOT_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_exclamation (pp);
|
|
|
|
|
pp_c_cast_expression (pp, TREE_OPERAND (e, 0));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIZEOF_EXPR:
|
|
|
|
|
case ALIGNOF_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, code == SIZEOF_EXPR ? "sizeof" : "__alignof__");
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (TYPE_P (TREE_OPERAND (e, 0)))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_cast (pp, TREE_OPERAND (e, 0));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_unary_expression (pp, TREE_OPERAND (e, 0));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
case IMAGPART_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, code == REALPART_EXPR ? "__real__" : "__imag__");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_unary_expression (pp, TREE_OPERAND (e, 0));
|
2002-07-30 01:42:26 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* cast-expression:
|
|
|
|
|
unary-expression
|
|
|
|
|
( type-name ) cast-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_cast_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
switch (TREE_CODE (e))
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case FLOAT_EXPR:
|
|
|
|
|
case FIX_TRUNC_EXPR:
|
|
|
|
|
case CONVERT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_type_cast (pp, TREE_TYPE (e));
|
|
|
|
|
pp_c_cast_expression (pp, TREE_OPERAND (e, 0));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_unary_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* multiplicative-expression:
|
|
|
|
|
cast-expression
|
|
|
|
|
multiplicative-expression * cast-expression
|
|
|
|
|
multiplicative-expression / cast-expression
|
|
|
|
|
multiplicative-expression % cast-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_multiplicative_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case MULT_EXPR:
|
|
|
|
|
case TRUNC_DIV_EXPR:
|
|
|
|
|
case TRUNC_MOD_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_multiplicative_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (code == MULT_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_star (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == TRUNC_DIV_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_slash (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_modulo (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_cast_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_cast_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* additive-expression:
|
|
|
|
|
multiplicative-expression
|
|
|
|
|
additive-expression + multiplicative-expression
|
|
|
|
|
additive-expression - multiplicative-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_additive_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
case MINUS_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_additive_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (code == PLUS_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_plus (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_minus (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_multiplicative_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_multiplicative_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* additive-expression:
|
|
|
|
|
additive-expression
|
|
|
|
|
shift-expression << additive-expression
|
|
|
|
|
shift-expression >> additive-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_shift_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case LSHIFT_EXPR:
|
|
|
|
|
case RSHIFT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_shift_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_identifier (pp, code == LSHIFT_EXPR ? "<<" : ">>");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_additive_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_additive_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* relational-expression:
|
|
|
|
|
shift-expression
|
|
|
|
|
relational-expression < shift-expression
|
|
|
|
|
relational-expression > shift-expression
|
|
|
|
|
relational-expression <= shift-expression
|
|
|
|
|
relational-expression >= shift-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_relational_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case LT_EXPR:
|
|
|
|
|
case GT_EXPR:
|
|
|
|
|
case LE_EXPR:
|
|
|
|
|
case GE_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_relational_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
if (code == LT_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_less (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == GT_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_greater (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == LE_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_identifier (pp, "<=");
|
2002-07-29 21:31:24 +02:00
|
|
|
|
else if (code == GE_EXPR)
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_identifier (pp, ">=");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_shift_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_shift_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* equality-expression:
|
|
|
|
|
relational-expression
|
|
|
|
|
equality-expression == relational-expression
|
|
|
|
|
equality-equality != relational-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_equality_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
enum tree_code code = TREE_CODE (e);
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case EQ_EXPR:
|
|
|
|
|
case NE_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_equality_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_identifier (pp, code == EQ_EXPR ? "==" : "!=");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_relational_expression (pp, TREE_OPERAND (e, 1));
|
2003-06-22 15:41:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_relational_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* AND-expression:
|
|
|
|
|
equality-expression
|
|
|
|
|
AND-expression & equality-equality */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_and_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == BIT_AND_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_and_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_ampersand (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_equality_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_equality_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* exclusive-OR-expression:
|
|
|
|
|
AND-expression
|
|
|
|
|
exclusive-OR-expression ^ AND-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_exclusive_or_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == BIT_XOR_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_exclusive_or_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_maybe_whitespace (pp);
|
|
|
|
|
pp_carret (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_and_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_and_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* inclusive-OR-expression:
|
|
|
|
|
exclusive-OR-expression
|
|
|
|
|
inclusive-OR-expression | exclusive-OR-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_inclusive_or_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == BIT_IOR_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_exclusive_or_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_bar (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_exclusive_or_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_exclusive_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* logical-AND-expression:
|
|
|
|
|
inclusive-OR-expression
|
|
|
|
|
logical-AND-expression && inclusive-OR-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
re PR target/13608 (Incorrect code with -O3 -ffast-math)
* i386.md (load_tp_di): Fix pasto.
PR opt/13608
* i386.c (ix86_compute_frame_layout): Fix for alloca on leaf function.
* c-pretty-print.c (pp_c_type_cast, pp_c_abstract_declarator,
pp_c_character_constant, pp_c_floating_constant,
pp_c_additive_expression, pp_c_shift_expression,
pp_c_equality_expression, pp_c_and_expression,
pp_c_exclusive_or_expression, pp_c_inclusive_or_expression,
pp_c_logical_and_expression): Remove inline modifier.
* dwarf2out.c (get_AT): Likewise.
* et-forest.c (et_splay): Likewise.
* ra.h (ra_alloc, ra_calloc): Likewise
* mangle.c (write_mangled_name): Remove inline modifier.
From-SVN: r75988
2004-01-16 19:53:51 +01:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_and_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == TRUTH_ANDIF_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_and_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_identifier (pp, "&&");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_inclusive_or_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_inclusive_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* logical-OR-expression:
|
|
|
|
|
logical-AND-expression
|
|
|
|
|
logical-OR-expression || logical-AND-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_or_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == TRUTH_ORIF_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_identifier (pp, "||");
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_logical_and_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_and_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* conditional-expression:
|
|
|
|
|
logical-OR-expression
|
|
|
|
|
logical-OR-expression ? expression : conditional-expression */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_conditional_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
if (TREE_CODE (e) == COND_EXPR)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_question (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 1));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_colon (pp);
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_c_conditional_expression (pp, TREE_OPERAND (e, 2));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* assignment-expression:
|
|
|
|
|
conditional-expression
|
|
|
|
|
unary-expression assignment-operator assignment-expression
|
|
|
|
|
|
|
|
|
|
assignment-expression: one of
|
|
|
|
|
= *= /= %= += -= >>= <<= &= ^= |= */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
static void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_assignment_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2002-07-30 01:42:26 +02:00
|
|
|
|
if (TREE_CODE (e) == MODIFY_EXPR || TREE_CODE (e) == INIT_EXPR)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_unary_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_c_whitespace (pp);
|
|
|
|
|
pp_equal (pp);
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_expression (pp, TREE_OPERAND (e, 1));
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_conditional_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* expression:
|
|
|
|
|
assignment-expression
|
|
|
|
|
expression , assignment-expression
|
|
|
|
|
|
|
|
|
|
Implementation note: instead of going through the usual recursion
|
|
|
|
|
chain, I take the liberty of dispatching nodes to the appropriate
|
|
|
|
|
functions. This makes some redundancy, but it worths it. That also
|
|
|
|
|
prevents a possible infinite recursion between pp_c_primary_expression ()
|
|
|
|
|
and pp_c_expression (). */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_expression (c_pretty_printer *pp, tree e)
|
2002-07-29 21:31:24 +02:00
|
|
|
|
{
|
|
|
|
|
switch (TREE_CODE (e))
|
|
|
|
|
{
|
|
|
|
|
case INTEGER_CST:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_integer_constant (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case REAL_CST:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_floating_constant (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case STRING_CST:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_string_literal (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-08-25 21:10:50 +02:00
|
|
|
|
case IDENTIFIER_NODE:
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case FUNCTION_DECL:
|
|
|
|
|
case VAR_DECL:
|
|
|
|
|
case CONST_DECL:
|
|
|
|
|
case PARM_DECL:
|
|
|
|
|
case RESULT_DECL:
|
|
|
|
|
case FIELD_DECL:
|
|
|
|
|
case LABEL_DECL:
|
|
|
|
|
case ERROR_MARK:
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case STMT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_primary_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case POSTINCREMENT_EXPR:
|
|
|
|
|
case POSTDECREMENT_EXPR:
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case ARROW_EXPR:
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case ARRAY_REF:
|
|
|
|
|
case CALL_EXPR:
|
|
|
|
|
case COMPONENT_REF:
|
|
|
|
|
case COMPLEX_CST:
|
2003-09-18 10:25:12 +02:00
|
|
|
|
case COMPLEX_EXPR:
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case VECTOR_CST:
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case ABS_EXPR:
|
|
|
|
|
case CONSTRUCTOR:
|
2002-07-30 08:34:57 +02:00
|
|
|
|
case COMPOUND_LITERAL_EXPR:
|
|
|
|
|
case VA_ARG_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_postfix_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-30 01:42:26 +02:00
|
|
|
|
case CONJ_EXPR:
|
|
|
|
|
case ADDR_EXPR:
|
|
|
|
|
case INDIRECT_REF:
|
|
|
|
|
case NEGATE_EXPR:
|
|
|
|
|
case BIT_NOT_EXPR:
|
|
|
|
|
case TRUTH_NOT_EXPR:
|
|
|
|
|
case PREINCREMENT_EXPR:
|
|
|
|
|
case PREDECREMENT_EXPR:
|
|
|
|
|
case SIZEOF_EXPR:
|
|
|
|
|
case ALIGNOF_EXPR:
|
|
|
|
|
case REALPART_EXPR:
|
|
|
|
|
case IMAGPART_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_unary_expression (pp, e);
|
2002-07-30 01:42:26 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FLOAT_EXPR:
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case FIX_TRUNC_EXPR:
|
|
|
|
|
case CONVERT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_cast_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case MULT_EXPR:
|
|
|
|
|
case TRUNC_MOD_EXPR:
|
|
|
|
|
case TRUNC_DIV_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_multiplicative_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LSHIFT_EXPR:
|
|
|
|
|
case RSHIFT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_shift_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case LT_EXPR:
|
|
|
|
|
case GT_EXPR:
|
|
|
|
|
case LE_EXPR:
|
|
|
|
|
case GE_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_relational_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BIT_AND_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_and_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BIT_XOR_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_exclusive_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BIT_IOR_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_inclusive_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TRUTH_ANDIF_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_and_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TRUTH_ORIF_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_logical_or_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case EQ_EXPR:
|
|
|
|
|
case NE_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_equality_expression (pp, e);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
case COND_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_conditional_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case PLUS_EXPR:
|
|
|
|
|
case MINUS_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_additive_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case MODIFY_EXPR:
|
|
|
|
|
case INIT_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_assignment_expression (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case COMPOUND_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
pp_separate_with (pp, ',');
|
|
|
|
|
pp_assignment_expression (pp, TREE_OPERAND (e, 1));
|
|
|
|
|
pp_c_right_paren (pp);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
2003-06-22 15:41:26 +02:00
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
case NOP_EXPR:
|
|
|
|
|
case NON_LVALUE_EXPR:
|
|
|
|
|
case SAVE_EXPR:
|
|
|
|
|
case UNSAVE_EXPR:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, TREE_OPERAND (e, 0));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case TARGET_EXPR:
|
|
|
|
|
pp_postfix_expression (pp, TREE_OPERAND (e, 1));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
2002-07-29 21:31:24 +02:00
|
|
|
|
default:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_unsupported_tree (pp, e);
|
2002-07-29 21:31:24 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
2002-07-30 15:48:06 +02:00
|
|
|
|
|
|
|
|
|
/* Statements. */
|
2003-08-25 21:10:50 +02:00
|
|
|
|
|
|
|
|
|
/* statement:
|
|
|
|
|
labeled-statement
|
2003-11-21 07:52:23 +01:00
|
|
|
|
compound-statement
|
2003-08-25 21:10:50 +02:00
|
|
|
|
expression-statement
|
|
|
|
|
selection-statement
|
|
|
|
|
iteration-statement
|
|
|
|
|
jump-statement */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-07-30 15:48:06 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_statement (c_pretty_printer *pp, tree stmt)
|
2002-07-30 15:48:06 +02:00
|
|
|
|
{
|
2003-08-10 20:17:06 +02:00
|
|
|
|
enum tree_code code;
|
|
|
|
|
|
|
|
|
|
if (stmt == NULL)
|
|
|
|
|
return;
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
|
|
|
|
|
if (pp_needs_newline (pp))
|
|
|
|
|
pp_newline_and_indent (pp, 0);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
|
|
|
|
|
code = TREE_CODE (stmt);
|
2002-07-30 15:48:06 +02:00
|
|
|
|
switch (code)
|
|
|
|
|
{
|
2003-08-25 21:10:50 +02:00
|
|
|
|
/* expression-statement:
|
|
|
|
|
expression(opt) ; */
|
2002-07-30 15:48:06 +02:00
|
|
|
|
case EXPR_STMT:
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
pp_expression (pp, EXPR_STMT_EXPR (stmt));
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_semicolon (pp);
|
|
|
|
|
pp_needs_newline (pp) = true;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SWITCH_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "switch");
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, SWITCH_COND (stmt));
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
pp_indentation (pp) += 3;
|
|
|
|
|
pp_needs_newline (pp) = true;
|
|
|
|
|
pp_statement (pp, SWITCH_BODY (stmt));
|
|
|
|
|
pp_newline_and_indent (pp, -3);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* iteration-statement:
|
|
|
|
|
while ( expression ) statement
|
|
|
|
|
do statement while ( expression ) ;
|
|
|
|
|
for ( expression(opt) ; expression(opt) ; expression(opt) ) statement
|
|
|
|
|
for ( declaration expression(opt) ; expression(opt) ) statement */
|
2002-07-30 15:48:06 +02:00
|
|
|
|
case WHILE_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "while");
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, WHILE_COND (stmt));
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
pp_newline_and_indent (pp, 3);
|
|
|
|
|
pp_statement (pp, WHILE_BODY (stmt));
|
|
|
|
|
pp_indentation (pp) -= 3;
|
|
|
|
|
pp_needs_newline (pp) = true;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DO_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "do");
|
|
|
|
|
pp_newline_and_indent (pp, 3);
|
|
|
|
|
pp_statement (pp, DO_BODY (stmt));
|
|
|
|
|
pp_newline_and_indent (pp, -3);
|
|
|
|
|
pp_c_identifier (pp, "while");
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_left_paren (pp);
|
|
|
|
|
pp_expression (pp, DO_COND (stmt));
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
pp_c_semicolon (pp);
|
|
|
|
|
pp_needs_newline (pp) = true;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case FOR_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_identifier (pp, "for");
|
|
|
|
|
pp_space (pp);
|
|
|
|
|
pp_c_left_paren (pp);
|
2003-08-10 20:17:06 +02:00
|
|
|
|
if (FOR_INIT_STMT (stmt))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_statement (pp, FOR_INIT_STMT (stmt));
|
2003-08-10 20:17:06 +02:00
|
|
|
|
else
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_semicolon (pp);
|
|
|
|
|
pp_needs_newline (pp) = false;
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-30 15:48:06 +02:00
|
|
|
|
if (FOR_COND (stmt))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, FOR_COND (stmt));
|
|
|
|
|
pp_c_semicolon (pp);
|
|
|
|
|
pp_needs_newline (pp) = false;
|
|
|
|
|
pp_c_whitespace (pp);
|
2002-07-30 15:48:06 +02:00
|
|
|
|
if (FOR_EXPR (stmt))
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_expression (pp, FOR_EXPR (stmt));
|
|
|
|
|
pp_c_right_paren (pp);
|
|
|
|
|
pp_newline_and_indent (pp, 3);
|
|
|
|
|
pp_statement (pp, FOR_BODY (stmt));
|
|
|
|
|
pp_indentation (pp) -= 3;
|
|
|
|
|
pp_needs_newline (pp) = true;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* jump-statement:
|
|
|
|
|
goto identifier;
|
|
|
|
|
continue ;
|
|
|
|
|
return expression(opt) ; */
|
2002-07-30 15:48:06 +02:00
|
|
|
|
case BREAK_STMT:
|
|
|
|
|
case CONTINUE_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_identifier (pp, code == BREAK_STMT ? "break" : "continue");
|
|
|
|
|
pp_c_semicolon (pp);
|
|
|
|
|
pp_needs_newline (pp) = true;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case DECL_STMT:
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_declaration (pp, DECL_STMT_DECL (stmt));
|
|
|
|
|
pp_needs_newline (pp) = true;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
c-common.def (IF_STMT, [...]): Move to cp-tree.def.
* c-common.def (IF_STMT, CLEANUP_STMT): Move to cp-tree.def.
* c-common.h (IF_COND, THEN_CLAUSE, ELSE_CLAUSE, CLEANUP_BODY,
CLEANUP_EXPR, CLEANUP_DECL): Move to cp-tree.h.
(c_common_stmt_codes): Remove IF_STMT, CLEANUP_STMT.
* c-dump.c (c_dump_tree): Move IF_STMT, CLEANUP_STMT to cp_dump_tree.
* c-pretty-print.c (pp_c_statement): Similarly.
* c-gimplify.c (gimplify_cleanup_stmt, gimplify_cleanup_stmts,
gimplify_if_stmt): Move to cp-gimplify.c.
(c_genericize, c_gimplify_expr): Don't call them.
* c-semantics.c (push_cleanup): Move to cp/semantics.c.
* c-typeck.c (push_cleanup): New.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_finish_else,
c_finish_if_stmt): Use COND_EXPR.
* tree.h (CLEANUP_EH_ONLY): Update documentation.
cp/
* cp-tree.def (CLEANUP_STMT, IF_STMT): Move from c-common.def.
* cp-gimplify.c (gimplify_if_stmt): Move from c-gimplify.c.
(cp_gimplify_expr): Call it.
(gimplify_cleanup_stmt): Move from c-gimplify.c.
(cp_genericize): New.
* decl.c (finish_function): Call it.
* cp-tree.h (cp_stmt_codes): Add CLEANUP_STMT, IF_STMT.
(CLEANUP_BODY, CLEANUP_EXPR, CLEANUP_DECL): Move from c-common.h.
(IF_COND, THEN_CLAUSE, ELSE_CLAUSE): Likewise.
(cp_genericize): Declare.
* cxx-pretty-print.c (pp_cxx_statement): Add CLEANUP_STMT, IF_STMT.
* dump.c (cp_dump_tree): Likewise.
* semantics.c (push_cleanup): Move from c-semantics.c.
From-SVN: r83407
2004-06-20 11:18:13 +02:00
|
|
|
|
dump_generic_node (pp_base (pp), stmt, pp_indentation (pp), 0, true);
|
|
|
|
|
break;
|
2002-07-30 15:48:06 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-13 03:38:35 +02:00
|
|
|
|
|
|
|
|
|
/* Initialize the PRETTY-PRINTER for handling C codes. */
|
2003-09-18 10:25:12 +02:00
|
|
|
|
|
2002-08-13 03:38:35 +02:00
|
|
|
|
void
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp_c_pretty_printer_init (c_pretty_printer *pp)
|
2002-08-13 03:38:35 +02:00
|
|
|
|
{
|
|
|
|
|
pp->offset_list = 0;
|
|
|
|
|
|
|
|
|
|
pp->declaration = pp_c_declaration;
|
|
|
|
|
pp->declaration_specifiers = pp_c_declaration_specifiers;
|
|
|
|
|
pp->declarator = pp_c_declarator;
|
|
|
|
|
pp->direct_declarator = pp_c_direct_declarator;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp->type_specifier_seq = pp_c_specifier_qualifier_list;
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp->abstract_declarator = pp_c_abstract_declarator;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp->direct_abstract_declarator = pp_c_direct_abstract_declarator;
|
|
|
|
|
pp->ptr_operator = pp_c_pointer;
|
|
|
|
|
pp->parameter_list = pp_c_parameter_type_list;
|
2002-08-13 03:38:35 +02:00
|
|
|
|
pp->type_id = pp_c_type_id;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp->simple_type_specifier = pp_c_type_specifier;
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp->function_specifier = pp_c_function_specifier;
|
|
|
|
|
pp->storage_class_specifier = pp_c_storage_class_specifier;
|
2002-08-13 03:38:35 +02:00
|
|
|
|
|
|
|
|
|
pp->statement = pp_c_statement;
|
|
|
|
|
|
2003-08-10 20:17:06 +02:00
|
|
|
|
pp->id_expression = pp_c_id_expression;
|
2002-08-13 03:38:35 +02:00
|
|
|
|
pp->primary_expression = pp_c_primary_expression;
|
|
|
|
|
pp->postfix_expression = pp_c_postfix_expression;
|
|
|
|
|
pp->unary_expression = pp_c_unary_expression;
|
|
|
|
|
pp->initializer = pp_c_initializer;
|
|
|
|
|
pp->multiplicative_expression = pp_c_multiplicative_expression;
|
|
|
|
|
pp->conditional_expression = pp_c_conditional_expression;
|
|
|
|
|
pp->assignment_expression = pp_c_assignment_expression;
|
2003-08-25 21:10:50 +02:00
|
|
|
|
pp->expression = pp_c_expression;
|
2002-08-13 03:38:35 +02:00
|
|
|
|
}
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Print the tree T in full, on file FILE. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_c_tree (FILE *file, tree t)
|
|
|
|
|
{
|
|
|
|
|
static c_pretty_printer pp_rec;
|
|
|
|
|
static bool initialized = 0;
|
|
|
|
|
c_pretty_printer *pp = &pp_rec;
|
|
|
|
|
|
|
|
|
|
if (!initialized)
|
|
|
|
|
{
|
|
|
|
|
initialized = 1;
|
|
|
|
|
pp_construct (pp_base (pp), NULL, 0);
|
|
|
|
|
pp_c_pretty_printer_init (pp);
|
|
|
|
|
pp_needs_newline (pp) = true;
|
|
|
|
|
}
|
|
|
|
|
pp_base (pp)->buffer->stream = file;
|
|
|
|
|
|
|
|
|
|
pp_statement (pp, t);
|
|
|
|
|
|
|
|
|
|
pp_newline (pp);
|
|
|
|
|
pp_flush (pp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print the tree T in full, on stderr. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
debug_c_tree (tree t)
|
|
|
|
|
{
|
|
|
|
|
print_c_tree (stderr, t);
|
|
|
|
|
fputc ('\n', stderr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Output the DECL_NAME of T. If T has no DECL_NAME, output a string made
|
|
|
|
|
up of T's memory address. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pp_c_tree_decl_identifier (c_pretty_printer *pp, tree t)
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
if (!DECL_P (t))
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
if (DECL_NAME (t))
|
|
|
|
|
name = IDENTIFIER_POINTER (DECL_NAME (t));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
static char xname[8];
|
|
|
|
|
sprintf (xname, "<U%4x>", ((unsigned)((unsigned long)(t) & 0xffff)));
|
|
|
|
|
name = xname;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pp_c_identifier (pp, name);
|
|
|
|
|
}
|