Skip to content

R
riscv-gcc-1
Commit 00d34d3a by Gabriel Dos Reis
Options

c-pretty-print.h (c_pretty_printer::unary_expression): Now a virtual member function. 

c-family/
	* c-pretty-print.h (c_pretty_printer::unary_expression): Now a
	virtual member function.
	(c_pretty_printer::multiplicative_expression): Likewise.
	(c_pretty_printer::conditional_expression): Likewise.
	(c_pretty_printer::assignment_expression): Likewise.
	(c_pretty_printer::expression): Likewise.
	(pp_unary_expression): Adjust.
	(pp_multiplicative_expression): Likewise.
	(pp_assignment_expression): Likewise.
	(pp_conditional_expression): Likewise.
	(pp_expression): Likewise.
	* c-pretty-print.c (c_pretty_printer::unary_expression): Rename
	from pp_c_unary_expression.  Adjust.
	(c_pretty_printer::multiplicative_expression): Rename from
	pp_c_multiplicative_expression.  Adjust.
	(c_pretty_printer::conditional_expression): Rename from
	pp_c_conditional_expression.  Adjust.
	(c_pretty_printer::assignment_expression): Rename from
	pp_c_assignment_expression.  Adjust.
	(c_pretty_printer::expression): Rename from pp_c_expression.  Adjust.
	(c_pretty_printer::c_pretty_printer): Do not assign to
	unary_expression, multiplicative_expression,
	conditional_expression, expression.

cp/
	* cxx-pretty-print.h (cxx_pretty_printer::unary_expression):
	Declare as overrider.
	(cxx_pretty_printer::multiplicative_expression): Likewise.
	(cxx_pretty_printer::conditional_expression): Likewise.
	(cxx_pretty_printer::assignment_expression): Likewise.
	(cxx_pretty_printer::expression): Likewise.
	* cxx-pretty-print.c (cxx_pretty_printer::unary_expression):
	Rename from pp_cxx_unary_expression.  Adjust.
	(cxx_pretty_printer::multiplicative_expression): Rename from
	pp_cxx_multiplicative_expression.  Adjust.
	(cxx_pretty_printer::conditional_expression): Rename from
	pp_cxx_conditional_expression.  Adjust.
	(cxx_pretty_printer::assignment_expression): Rename from
	pp_cxx_assignment_expression.  Adjust.
	(cxx_pretty_printer::expression): Rename from pp_cxx_expression.
	Adjust.
	(cxx_pretty_printer::cxx_pretty_printer): Dot not assign to
	unary_expression, multiplicative_expression,
	conditional_expression, assignment_expression, expression.

From-SVN: r201987
parent fb22178f
Showing with 266 additions and 231 deletions
gcc/c-family/ChangeLog
2013-08-26 Gabriel Dos Reis <gdre@integrable-solutions.net>
* c-pretty-print.h (c_pretty_printer::unary_expression): Now a
virtual member function.
(c_pretty_printer::multiplicative_expression): Likewise.
(c_pretty_printer::conditional_expression): Likewise.
(c_pretty_printer::assignment_expression): Likewise.
(c_pretty_printer::expression): Likewise.
(pp_unary_expression): Adjust.
(pp_multiplicative_expression): Likewise.
(pp_assignment_expression): Likewise.
(pp_conditional_expression): Likewise.
(pp_expression): Likewise.
* c-pretty-print.c (c_pretty_printer::unary_expression): Rename
from pp_c_unary_expression. Adjust.
(c_pretty_printer::multiplicative_expression): Rename from
pp_c_multiplicative_expression. Adjust.
(c_pretty_printer::conditional_expression): Rename from
pp_c_conditional_expression. Adjust.
(c_pretty_printer::assignment_expression): Rename from
pp_c_assignment_expression. Adjust.
(c_pretty_printer::expression): Rename from pp_c_expression. Adjust.
(c_pretty_printer::c_pretty_printer): Do not assign to
unary_expression, multiplicative_expression,
conditional_expression, expression.
2013-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net> 2013-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net>
* c-pretty-print.h (c_pretty_printer::postfix_expression): Now a * c-pretty-print.h (c_pretty_printer::postfix_expression): Now a
......
gcc/c-family/c-pretty-print.c
...@@ -50,7 +50,6 @@ static void pp_c_char (c_pretty_printer *, int); ...@@ -50,7 +50,6 @@ static void pp_c_char (c_pretty_printer *, int);
static void pp_c_initializer_list (c_pretty_printer *, tree); static void pp_c_initializer_list (c_pretty_printer *, tree);
static void pp_c_brace_enclosed_initializer_list (c_pretty_printer *, tree); static void pp_c_brace_enclosed_initializer_list (c_pretty_printer *, tree);
static void pp_c_multiplicative_expression (c_pretty_printer *, tree);
static void pp_c_additive_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_shift_expression (c_pretty_printer *, tree);
static void pp_c_relational_expression (c_pretty_printer *, tree); static void pp_c_relational_expression (c_pretty_printer *, tree);
...@@ -59,8 +58,6 @@ static void pp_c_and_expression (c_pretty_printer *, tree); ...@@ -59,8 +58,6 @@ 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_exclusive_or_expression (c_pretty_printer *, tree);
static void pp_c_inclusive_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_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);
/* declarations. */ /* declarations. */
...@@ -1255,7 +1252,7 @@ c_pretty_printer::primary_expression (tree e) ...@@ -1255,7 +1252,7 @@ c_pretty_printer::primary_expression (tree e)
if (TREE_OPERAND (e, 2)) if (TREE_OPERAND (e, 2))
{ {
pp_separate_with (this, ','); pp_separate_with (this, ',');
pp_c_expression (this, TREE_OPERAND (e, 2)); expression (TREE_OPERAND (e, 2));
} }
pp_c_right_paren (this); pp_c_right_paren (this);
break; break;
...@@ -1619,7 +1616,7 @@ c_pretty_printer::postfix_expression (tree e) ...@@ -1619,7 +1616,7 @@ c_pretty_printer::postfix_expression (tree e)
break; break;
case MEM_REF: case MEM_REF:
pp_c_expression (this, e); expression (e);
break; break;
case COMPLEX_CST: case COMPLEX_CST:
...@@ -1641,7 +1638,7 @@ c_pretty_printer::postfix_expression (tree e) ...@@ -1641,7 +1638,7 @@ c_pretty_printer::postfix_expression (tree e)
case VA_ARG_EXPR: case VA_ARG_EXPR:
pp_c_ws_string (this, "__builtin_va_arg"); pp_c_ws_string (this, "__builtin_va_arg");
pp_c_left_paren (this); pp_c_left_paren (this);
pp_assignment_expression (this, TREE_OPERAND (e, 0)); assignment_expression (TREE_OPERAND (e, 0));
pp_separate_with (this, ','); pp_separate_with (this, ',');
pp_type_id (this, TREE_TYPE (e)); pp_type_id (this, TREE_TYPE (e));
pp_c_right_paren (this); pp_c_right_paren (this);
...@@ -1721,15 +1718,15 @@ pp_c_call_argument_list (c_pretty_printer *pp, tree t) ...@@ -1721,15 +1718,15 @@ pp_c_call_argument_list (c_pretty_printer *pp, tree t)
__imag__ unary-expression */ __imag__ unary-expression */
void void
pp_c_unary_expression (c_pretty_printer *pp, tree e) c_pretty_printer::unary_expression (tree e)
{ {
enum tree_code code = TREE_CODE (e); enum tree_code code = TREE_CODE (e);
switch (code) switch (code)
{ {
case PREINCREMENT_EXPR: case PREINCREMENT_EXPR:
case PREDECREMENT_EXPR: case PREDECREMENT_EXPR:
pp_string (pp, code == PREINCREMENT_EXPR ? "++" : "--"); pp_string (this, code == PREINCREMENT_EXPR ? "++" : "--");
pp_c_unary_expression (pp, TREE_OPERAND (e, 0)); unary_expression (TREE_OPERAND (e, 0));
break; break;
case ADDR_EXPR: case ADDR_EXPR:
...@@ -1740,53 +1737,53 @@ pp_c_unary_expression (c_pretty_printer *pp, tree e) ...@@ -1740,53 +1737,53 @@ pp_c_unary_expression (c_pretty_printer *pp, tree e)
case CONJ_EXPR: case CONJ_EXPR:
/* String literal are used by address. */ /* String literal are used by address. */
if (code == ADDR_EXPR && TREE_CODE (TREE_OPERAND (e, 0)) != STRING_CST) if (code == ADDR_EXPR && TREE_CODE (TREE_OPERAND (e, 0)) != STRING_CST)
pp_ampersand (pp); pp_ampersand (this);
else if (code == INDIRECT_REF) else if (code == INDIRECT_REF)
pp_c_star (pp); pp_c_star (this);
else if (code == NEGATE_EXPR) else if (code == NEGATE_EXPR)
pp_minus (pp); pp_minus (this);
else if (code == BIT_NOT_EXPR || code == CONJ_EXPR) else if (code == BIT_NOT_EXPR || code == CONJ_EXPR)
pp_complement (pp); pp_complement (this);
else if (code == TRUTH_NOT_EXPR) else if (code == TRUTH_NOT_EXPR)
pp_exclamation (pp); pp_exclamation (this);
pp_c_cast_expression (pp, TREE_OPERAND (e, 0)); pp_c_cast_expression (this, TREE_OPERAND (e, 0));
break; break;
case MEM_REF: case MEM_REF:
if (TREE_CODE (TREE_OPERAND (e, 0)) == ADDR_EXPR if (TREE_CODE (TREE_OPERAND (e, 0)) == ADDR_EXPR
&& integer_zerop (TREE_OPERAND (e, 1))) && integer_zerop (TREE_OPERAND (e, 1)))
pp_c_expression (pp, TREE_OPERAND (TREE_OPERAND (e, 0), 0)); expression (TREE_OPERAND (TREE_OPERAND (e, 0), 0));
else else
{ {
pp_c_star (pp); pp_c_star (this);
if (!integer_zerop (TREE_OPERAND (e, 1))) if (!integer_zerop (TREE_OPERAND (e, 1)))
{ {
pp_c_left_paren (pp); pp_c_left_paren (this);
if (!integer_onep (TYPE_SIZE_UNIT if (!integer_onep (TYPE_SIZE_UNIT
(TREE_TYPE (TREE_TYPE (TREE_OPERAND (e, 0)))))) (TREE_TYPE (TREE_TYPE (TREE_OPERAND (e, 0))))))
pp_c_type_cast (pp, ptr_type_node); pp_c_type_cast (this, ptr_type_node);
} }
pp_c_cast_expression (pp, TREE_OPERAND (e, 0)); pp_c_cast_expression (this, TREE_OPERAND (e, 0));
if (!integer_zerop (TREE_OPERAND (e, 1))) if (!integer_zerop (TREE_OPERAND (e, 1)))
{ {
pp_plus (pp); pp_plus (this);
pp_c_integer_constant (pp, pp_c_integer_constant (this,
fold_convert (ssizetype, fold_convert (ssizetype,
TREE_OPERAND (e, 1))); TREE_OPERAND (e, 1)));
pp_c_right_paren (pp); pp_c_right_paren (this);
} }
} }
break; break;
case REALPART_EXPR: case REALPART_EXPR:
case IMAGPART_EXPR: case IMAGPART_EXPR:
pp_c_ws_string (pp, code == REALPART_EXPR ? "__real__" : "__imag__"); pp_c_ws_string (this, code == REALPART_EXPR ? "__real__" : "__imag__");
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_unary_expression (pp, TREE_OPERAND (e, 0)); unary_expression (TREE_OPERAND (e, 0));
break; break;
default: default:
pp_postfix_expression (pp, e); postfix_expression (e);
break; break;
} }
} }
...@@ -1819,8 +1816,8 @@ pp_c_cast_expression (c_pretty_printer *pp, tree e) ...@@ -1819,8 +1816,8 @@ pp_c_cast_expression (c_pretty_printer *pp, tree e)
multiplicative-expression / cast-expression multiplicative-expression / cast-expression
multiplicative-expression % cast-expression */ multiplicative-expression % cast-expression */
static void void
pp_c_multiplicative_expression (c_pretty_printer *pp, tree e) c_pretty_printer::multiplicative_expression (tree e)
{ {
enum tree_code code = TREE_CODE (e); enum tree_code code = TREE_CODE (e);
switch (code) switch (code)
...@@ -1828,20 +1825,20 @@ pp_c_multiplicative_expression (c_pretty_printer *pp, tree e) ...@@ -1828,20 +1825,20 @@ pp_c_multiplicative_expression (c_pretty_printer *pp, tree e)
case MULT_EXPR: case MULT_EXPR:
case TRUNC_DIV_EXPR: case TRUNC_DIV_EXPR:
case TRUNC_MOD_EXPR: case TRUNC_MOD_EXPR:
pp_multiplicative_expression (pp, TREE_OPERAND (e, 0)); multiplicative_expression (TREE_OPERAND (e, 0));
pp_c_whitespace (pp); pp_c_whitespace (this);
if (code == MULT_EXPR) if (code == MULT_EXPR)
pp_c_star (pp); pp_c_star (this);
else if (code == TRUNC_DIV_EXPR) else if (code == TRUNC_DIV_EXPR)
pp_slash (pp); pp_slash (this);
else else
pp_modulo (pp); pp_modulo (this);
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_c_cast_expression (pp, TREE_OPERAND (e, 1)); pp_c_cast_expression (this, TREE_OPERAND (e, 1));
break; break;
default: default:
pp_c_cast_expression (pp, e); pp_c_cast_expression (this, e);
break; break;
} }
} }
...@@ -2069,23 +2066,23 @@ pp_c_logical_or_expression (c_pretty_printer *pp, tree e) ...@@ -2069,23 +2066,23 @@ pp_c_logical_or_expression (c_pretty_printer *pp, tree e)
logical-OR-expression logical-OR-expression
logical-OR-expression ? expression : conditional-expression */ logical-OR-expression ? expression : conditional-expression */
static void void
pp_c_conditional_expression (c_pretty_printer *pp, tree e) c_pretty_printer::conditional_expression (tree e)
{ {
if (TREE_CODE (e) == COND_EXPR) if (TREE_CODE (e) == COND_EXPR)
{ {
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0)); pp_c_logical_or_expression (this, TREE_OPERAND (e, 0));
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_question (pp); pp_question (this);
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_expression (pp, TREE_OPERAND (e, 1)); pp_expression (this, TREE_OPERAND (e, 1));
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_colon (pp); pp_colon (this);
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_c_conditional_expression (pp, TREE_OPERAND (e, 2)); conditional_expression (TREE_OPERAND (e, 2));
} }
else else
pp_c_logical_or_expression (pp, e); pp_c_logical_or_expression (this, e);
} }
...@@ -2096,20 +2093,20 @@ pp_c_conditional_expression (c_pretty_printer *pp, tree e) ...@@ -2096,20 +2093,20 @@ pp_c_conditional_expression (c_pretty_printer *pp, tree e)
assignment-expression: one of assignment-expression: one of
= *= /= %= += -= >>= <<= &= ^= |= */ = *= /= %= += -= >>= <<= &= ^= |= */
static void void
pp_c_assignment_expression (c_pretty_printer *pp, tree e) c_pretty_printer::assignment_expression (tree e)
{ {
if (TREE_CODE (e) == MODIFY_EXPR if (TREE_CODE (e) == MODIFY_EXPR
|| TREE_CODE (e) == INIT_EXPR) || TREE_CODE (e) == INIT_EXPR)
{ {
pp_c_unary_expression (pp, TREE_OPERAND (e, 0)); unary_expression (TREE_OPERAND (e, 0));
pp_c_whitespace (pp); pp_c_whitespace (this);
pp_equal (pp); pp_equal (this);
pp_space (pp); pp_space (this);
pp_c_expression (pp, TREE_OPERAND (e, 1)); pp_expression (this, TREE_OPERAND (e, 1));
} }
else else
pp_c_conditional_expression (pp, e); conditional_expression (e);
} }
/* expression: /* expression:
...@@ -2120,27 +2117,27 @@ pp_c_assignment_expression (c_pretty_printer *pp, tree e) ...@@ -2120,27 +2117,27 @@ pp_c_assignment_expression (c_pretty_printer *pp, tree e)
chain, I take the liberty of dispatching nodes to the appropriate chain, I take the liberty of dispatching nodes to the appropriate
functions. This makes some redundancy, but it worths it. That also functions. This makes some redundancy, but it worths it. That also
prevents a possible infinite recursion between pp_primary_expression () prevents a possible infinite recursion between pp_primary_expression ()
and pp_c_expression (). */ and pp_expression (). */
void void
pp_c_expression (c_pretty_printer *pp, tree e) c_pretty_printer::expression (tree e)
{ {
switch (TREE_CODE (e)) switch (TREE_CODE (e))
{ {
case INTEGER_CST: case INTEGER_CST:
pp_c_integer_constant (pp, e); pp_c_integer_constant (this, e);
break; break;
case REAL_CST: case REAL_CST:
pp_c_floating_constant (pp, e); pp_c_floating_constant (this, e);
break; break;
case FIXED_CST: case FIXED_CST:
pp_c_fixed_constant (pp, e); pp_c_fixed_constant (this, e);
break; break;
case STRING_CST: case STRING_CST:
pp_c_string_literal (pp, e); pp_c_string_literal (this, e);
break; break;
case IDENTIFIER_NODE: case IDENTIFIER_NODE:
...@@ -2152,15 +2149,15 @@ pp_c_expression (c_pretty_printer *pp, tree e) ...@@ -2152,15 +2149,15 @@ pp_c_expression (c_pretty_printer *pp, tree e)
case FIELD_DECL: case FIELD_DECL:
case LABEL_DECL: case LABEL_DECL:
case ERROR_MARK: case ERROR_MARK:
pp_primary_expression (pp, e); primary_expression (e);
break; break;
case SSA_NAME: case SSA_NAME:
if (SSA_NAME_VAR (e) if (SSA_NAME_VAR (e)
&& !DECL_ARTIFICIAL (SSA_NAME_VAR (e))) && !DECL_ARTIFICIAL (SSA_NAME_VAR (e)))
pp_c_expression (pp, SSA_NAME_VAR (e)); expression (SSA_NAME_VAR (e));
else else
pp->translate_string ("<unknown>"); translate_string ("<unknown>");
break; break;
case POSTINCREMENT_EXPR: case POSTINCREMENT_EXPR:
...@@ -2185,7 +2182,7 @@ pp_c_expression (c_pretty_printer *pp, tree e) ...@@ -2185,7 +2182,7 @@ pp_c_expression (c_pretty_printer *pp, tree e)
case CONSTRUCTOR: case CONSTRUCTOR:
case COMPOUND_LITERAL_EXPR: case COMPOUND_LITERAL_EXPR:
case VA_ARG_EXPR: case VA_ARG_EXPR:
pp_postfix_expression (pp, e); postfix_expression (e);
break; break;
case CONJ_EXPR: case CONJ_EXPR:
...@@ -2199,107 +2196,107 @@ pp_c_expression (c_pretty_printer *pp, tree e) ...@@ -2199,107 +2196,107 @@ pp_c_expression (c_pretty_printer *pp, tree e)
case PREDECREMENT_EXPR: case PREDECREMENT_EXPR:
case REALPART_EXPR: case REALPART_EXPR:
case IMAGPART_EXPR: case IMAGPART_EXPR:
pp_c_unary_expression (pp, e); unary_expression (e);
break; break;
case FLOAT_EXPR: case FLOAT_EXPR:
case FIX_TRUNC_EXPR: case FIX_TRUNC_EXPR:
CASE_CONVERT: CASE_CONVERT:
case VIEW_CONVERT_EXPR: case VIEW_CONVERT_EXPR:
pp_c_cast_expression (pp, e); pp_c_cast_expression (this, e);
break; break;
case MULT_EXPR: case MULT_EXPR:
case TRUNC_MOD_EXPR: case TRUNC_MOD_EXPR:
case TRUNC_DIV_EXPR: case TRUNC_DIV_EXPR:
pp_multiplicative_expression (pp, e); multiplicative_expression (e);
break; break;
case LSHIFT_EXPR: case LSHIFT_EXPR:
case RSHIFT_EXPR: case RSHIFT_EXPR:
pp_c_shift_expression (pp, e); pp_c_shift_expression (this, e);
break; break;
case LT_EXPR: case LT_EXPR:
case GT_EXPR: case GT_EXPR:
case LE_EXPR: case LE_EXPR:
case GE_EXPR: case GE_EXPR:
pp_c_relational_expression (pp, e); pp_c_relational_expression (this, e);
break; break;
case BIT_AND_EXPR: case BIT_AND_EXPR:
pp_c_and_expression (pp, e); pp_c_and_expression (this, e);
break; break;
case BIT_XOR_EXPR: case BIT_XOR_EXPR:
case TRUTH_XOR_EXPR: case TRUTH_XOR_EXPR:
pp_c_exclusive_or_expression (pp, e); pp_c_exclusive_or_expression (this, e);
break; break;
case BIT_IOR_EXPR: case BIT_IOR_EXPR:
pp_c_inclusive_or_expression (pp, e); pp_c_inclusive_or_expression (this, e);
break; break;
case TRUTH_ANDIF_EXPR: case TRUTH_ANDIF_EXPR:
case TRUTH_AND_EXPR: case TRUTH_AND_EXPR:
pp_c_logical_and_expression (pp, e); pp_c_logical_and_expression (this, e);
break; break;
case TRUTH_ORIF_EXPR: case TRUTH_ORIF_EXPR:
case TRUTH_OR_EXPR: case TRUTH_OR_EXPR:
pp_c_logical_or_expression (pp, e); pp_c_logical_or_expression (this, e);
break; break;
case EQ_EXPR: case EQ_EXPR:
case NE_EXPR: case NE_EXPR:
pp_c_equality_expression (pp, e); pp_c_equality_expression (this, e);
break; break;
case COND_EXPR: case COND_EXPR:
pp_conditional_expression (pp, e); conditional_expression (e);
break; break;
case POINTER_PLUS_EXPR: case POINTER_PLUS_EXPR:
case PLUS_EXPR: case PLUS_EXPR:
case MINUS_EXPR: case MINUS_EXPR:
pp_c_additive_expression (pp, e); pp_c_additive_expression (this, e);
break; break;
case MODIFY_EXPR: case MODIFY_EXPR:
case INIT_EXPR: case INIT_EXPR:
pp_assignment_expression (pp, e); assignment_expression (e);
break; break;
case COMPOUND_EXPR: case COMPOUND_EXPR:
pp_c_left_paren (pp); pp_c_left_paren (this);
pp_expression (pp, TREE_OPERAND (e, 0)); expression (TREE_OPERAND (e, 0));
pp_separate_with (pp, ','); pp_separate_with (this, ',');
pp_assignment_expression (pp, TREE_OPERAND (e, 1)); assignment_expression (TREE_OPERAND (e, 1));
pp_c_right_paren (pp); pp_c_right_paren (this);
break; break;
case NON_LVALUE_EXPR: case NON_LVALUE_EXPR:
case SAVE_EXPR: case SAVE_EXPR:
pp_expression (pp, TREE_OPERAND (e, 0)); expression (TREE_OPERAND (e, 0));
break; break;
case TARGET_EXPR: case TARGET_EXPR:
pp_postfix_expression (pp, TREE_OPERAND (e, 1)); postfix_expression (TREE_OPERAND (e, 1));
break; break;
case BIND_EXPR: case BIND_EXPR:
case GOTO_EXPR: case GOTO_EXPR:
/* We don't yet have a way of dumping statements in a /* We don't yet have a way of dumping statements in a
human-readable format. */ human-readable format. */
pp_string (pp, "({...})"); pp_string (this, "({...})");
break; break;
case C_MAYBE_CONST_EXPR: case C_MAYBE_CONST_EXPR:
pp_c_expression (pp, C_MAYBE_CONST_EXPR_EXPR (e)); expression (C_MAYBE_CONST_EXPR_EXPR (e));
break; break;
default: default:
pp_unsupported_tree (pp, e); pp_unsupported_tree (this, e);
break; break;
} }
} }
...@@ -2344,12 +2341,7 @@ c_pretty_printer::c_pretty_printer () ...@@ -2344,12 +2341,7 @@ c_pretty_printer::c_pretty_printer ()
statement = pp_c_statement; statement = pp_c_statement;
unary_expression = pp_c_unary_expression;
initializer = pp_c_initializer; initializer = pp_c_initializer;
multiplicative_expression = pp_c_multiplicative_expression;
conditional_expression = pp_c_conditional_expression;
assignment_expression = pp_c_assignment_expression;
expression = pp_c_expression;
} }
......
gcc/c-family/c-pretty-print.h
...@@ -58,6 +58,11 @@ struct c_pretty_printer : pretty_printer ...@@ -58,6 +58,11 @@ struct c_pretty_printer : pretty_printer
virtual void id_expression (tree); virtual void id_expression (tree);
virtual void primary_expression (tree); virtual void primary_expression (tree);
virtual void postfix_expression (tree); virtual void postfix_expression (tree);
virtual void unary_expression (tree);
virtual void multiplicative_expression (tree);
virtual void conditional_expression (tree);
virtual void assignment_expression (tree);
virtual void expression (tree);
/* Points to the first element of an array of offset-list. /* Points to the first element of an array of offset-list.
Not used yet. */ Not used yet. */
int *offset_list; int *offset_list;
...@@ -83,11 +88,6 @@ struct c_pretty_printer : pretty_printer ...@@ -83,11 +88,6 @@ struct c_pretty_printer : pretty_printer
c_pretty_print_fn statement; c_pretty_print_fn statement;
c_pretty_print_fn unary_expression;
c_pretty_print_fn multiplicative_expression;
c_pretty_print_fn conditional_expression;
c_pretty_print_fn assignment_expression;
c_pretty_print_fn expression;
}; };
#define pp_c_tree_identifier(PPI, ID) \ #define pp_c_tree_identifier(PPI, ID) \
...@@ -116,13 +116,13 @@ struct c_pretty_printer : pretty_printer ...@@ -116,13 +116,13 @@ struct c_pretty_printer : pretty_printer
#define pp_id_expression(PP, E) (PP)->id_expression (E) #define pp_id_expression(PP, E) (PP)->id_expression (E)
#define pp_primary_expression(PP, E) (PP)->primary_expression (E) #define pp_primary_expression(PP, E) (PP)->primary_expression (E)
#define pp_postfix_expression(PP, E) (PP)->postfix_expression (E) #define pp_postfix_expression(PP, E) (PP)->postfix_expression (E)
#define pp_unary_expression(PP, E) (PP)->unary_expression (PP, E) #define pp_unary_expression(PP, E) (PP)->unary_expression (E)
#define pp_initializer(PP, E) (PP)->initializer (PP, E) #define pp_initializer(PP, E) (PP)->initializer (PP, E)
#define pp_multiplicative_expression(PP, E) \ #define pp_multiplicative_expression(PP, E) \
(PP)->multiplicative_expression (PP, E) (PP)->multiplicative_expression (E)
#define pp_conditional_expression(PP, E) (PP)->conditional_expression (PP, E) #define pp_conditional_expression(PP, E) (PP)->conditional_expression (E)
#define pp_assignment_expression(PP, E) (PP)->assignment_expression (PP, E) #define pp_assignment_expression(PP, E) (PP)->assignment_expression (E)
#define pp_expression(PP, E) (PP)->expression (PP, E) #define pp_expression(PP, E) (PP)->expression (E)
void pp_c_whitespace (c_pretty_printer *); void pp_c_whitespace (c_pretty_printer *);
...@@ -162,12 +162,10 @@ void pp_c_storage_class_specifier (c_pretty_printer *, tree); ...@@ -162,12 +162,10 @@ void pp_c_storage_class_specifier (c_pretty_printer *, tree);
/* Statements. */ /* Statements. */
void pp_c_statement (c_pretty_printer *, tree); void pp_c_statement (c_pretty_printer *, tree);
/* Expressions. */ /* Expressions. */
void pp_c_expression (c_pretty_printer *, tree);
void pp_c_logical_or_expression (c_pretty_printer *, tree); void pp_c_logical_or_expression (c_pretty_printer *, tree);
void pp_c_expression_list (c_pretty_printer *, tree); void pp_c_expression_list (c_pretty_printer *, tree);
void pp_c_constructor_elts (c_pretty_printer *, vec<constructor_elt, va_gc> *); void pp_c_constructor_elts (c_pretty_printer *, vec<constructor_elt, va_gc> *);
void pp_c_call_argument_list (c_pretty_printer *, tree); void pp_c_call_argument_list (c_pretty_printer *, tree);
void pp_c_unary_expression (c_pretty_printer *, tree);
void pp_c_cast_expression (c_pretty_printer *, tree); void pp_c_cast_expression (c_pretty_printer *, tree);
void pp_c_init_declarator (c_pretty_printer *, tree); void pp_c_init_declarator (c_pretty_printer *, tree);
void pp_c_ws_string (c_pretty_printer *, const char *); void pp_c_ws_string (c_pretty_printer *, const char *);
......
gcc/cp/ChangeLog
2013-08-26 Gabriel Dos Reis <gdr@integrable-solutions.net>
* cxx-pretty-print.h (cxx_pretty_printer::unary_expression):
Declare as overrider.
(cxx_pretty_printer::multiplicative_expression): Likewise.
(cxx_pretty_printer::conditional_expression): Likewise.
(cxx_pretty_printer::assignment_expression): Likewise.
(cxx_pretty_printer::expression): Likewise.
* cxx-pretty-print.c (cxx_pretty_printer::unary_expression):
Rename from pp_cxx_unary_expression. Adjust.
(cxx_pretty_printer::multiplicative_expression): Rename from
pp_cxx_multiplicative_expression. Adjust.
(cxx_pretty_printer::conditional_expression): Rename from
pp_cxx_conditional_expression. Adjust.
(cxx_pretty_printer::assignment_expression): Rename from
pp_cxx_assignment_expression. Adjust.
(cxx_pretty_printer::expression): Rename from pp_cxx_expression.
Adjust.
(cxx_pretty_printer::cxx_pretty_printer): Dot not assign to
unary_expression, multiplicative_expression,
conditional_expression, assignment_expression, expression.
2013-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net> 2013-08-25 Gabriel Dos Reis <gdr@integrable-solutions.net>
* cxx-pretty-print.h (cxx_pretty_printer::postfix_expression): * cxx-pretty-print.h (cxx_pretty_printer::postfix_expression):
......
gcc/cp/cxx-pretty-print.c
...@@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see ...@@ -30,8 +30,6 @@ along with GCC; see the file COPYING3. If not see
static void pp_cxx_unqualified_id (cxx_pretty_printer *, tree); static void pp_cxx_unqualified_id (cxx_pretty_printer *, tree);
static void pp_cxx_nested_name_specifier (cxx_pretty_printer *, tree); static void pp_cxx_nested_name_specifier (cxx_pretty_printer *, tree);
static void pp_cxx_qualified_id (cxx_pretty_printer *, tree); static void pp_cxx_qualified_id (cxx_pretty_printer *, tree);
static void pp_cxx_assignment_expression (cxx_pretty_printer *, tree);
static void pp_cxx_expression (cxx_pretty_printer *, tree);
static void pp_cxx_template_argument_list (cxx_pretty_printer *, tree); static void pp_cxx_template_argument_list (cxx_pretty_printer *, tree);
static void pp_cxx_type_specifier_seq (cxx_pretty_printer *, tree); static void pp_cxx_type_specifier_seq (cxx_pretty_printer *, tree);
static void pp_cxx_ptr_operator (cxx_pretty_printer *, tree); static void pp_cxx_ptr_operator (cxx_pretty_printer *, tree);
...@@ -552,7 +550,7 @@ cxx_pretty_printer::postfix_expression (tree t) ...@@ -552,7 +550,7 @@ cxx_pretty_printer::postfix_expression (tree t)
skipfirst = false; skipfirst = false;
else else
{ {
pp_cxx_expression (this, arg); expression (arg);
if (more_aggr_init_expr_args_p (&iter)) if (more_aggr_init_expr_args_p (&iter))
pp_cxx_separate_with (this, ','); pp_cxx_separate_with (this, ',');
} }
...@@ -567,7 +565,7 @@ cxx_pretty_printer::postfix_expression (tree t) ...@@ -567,7 +565,7 @@ cxx_pretty_printer::postfix_expression (tree t)
skipfirst = false; skipfirst = false;
else else
{ {
pp_cxx_expression (this, arg); expression (arg);
if (more_call_expr_args_p (&iter)) if (more_call_expr_args_p (&iter))
pp_cxx_separate_with (this, ','); pp_cxx_separate_with (this, ',');
} }
...@@ -610,7 +608,7 @@ cxx_pretty_printer::postfix_expression (tree t) ...@@ -610,7 +608,7 @@ cxx_pretty_printer::postfix_expression (tree t)
pp_cxx_type_id (this, TREE_TYPE (t)); pp_cxx_type_id (this, TREE_TYPE (t));
pp_cxx_end_template_argument_list (this); pp_cxx_end_template_argument_list (this);
pp_left_paren (this); pp_left_paren (this);
pp_cxx_expression (this, TREE_OPERAND (t, 0)); expression (TREE_OPERAND (t, 0));
pp_right_paren (this); pp_right_paren (this);
break; break;
...@@ -699,7 +697,7 @@ pp_cxx_new_expression (cxx_pretty_printer *pp, tree t) ...@@ -699,7 +697,7 @@ pp_cxx_new_expression (cxx_pretty_printer *pp, tree t)
else if (init == void_zero_node) else if (init == void_zero_node)
; /* OK, empty initializer list. */ ; /* OK, empty initializer list. */
else else
pp_cxx_expression (pp, init); pp_expression (pp, init);
pp_right_paren (pp); pp_right_paren (pp);
} }
break; break;
...@@ -758,80 +756,80 @@ pp_cxx_delete_expression (cxx_pretty_printer *pp, tree t) ...@@ -758,80 +756,80 @@ pp_cxx_delete_expression (cxx_pretty_printer *pp, tree t)
__alignof__ unary-expression __alignof__ unary-expression
__alignof__ ( type-id ) */ __alignof__ ( type-id ) */
static void void
pp_cxx_unary_expression (cxx_pretty_printer *pp, tree t) cxx_pretty_printer::unary_expression (tree t)
{ {
enum tree_code code = TREE_CODE (t); enum tree_code code = TREE_CODE (t);
switch (code) switch (code)
{ {
case NEW_EXPR: case NEW_EXPR:
case VEC_NEW_EXPR: case VEC_NEW_EXPR:
pp_cxx_new_expression (pp, t); pp_cxx_new_expression (this, t);
break; break;
case DELETE_EXPR: case DELETE_EXPR:
case VEC_DELETE_EXPR: case VEC_DELETE_EXPR:
pp_cxx_delete_expression (pp, t); pp_cxx_delete_expression (this, t);
break; break;
case SIZEOF_EXPR: case SIZEOF_EXPR:
if (PACK_EXPANSION_P (TREE_OPERAND (t, 0))) if (PACK_EXPANSION_P (TREE_OPERAND (t, 0)))
{ {
pp_cxx_ws_string (pp, "sizeof"); pp_cxx_ws_string (this, "sizeof");
pp_cxx_ws_string (pp, "..."); pp_cxx_ws_string (this, "...");
pp_cxx_whitespace (pp); pp_cxx_whitespace (this);
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
if (TYPE_P (TREE_OPERAND (t, 0))) if (TYPE_P (TREE_OPERAND (t, 0)))
pp_cxx_type_id (pp, TREE_OPERAND (t, 0)); pp_cxx_type_id (this, TREE_OPERAND (t, 0));
else else
pp_unary_expression (pp, TREE_OPERAND (t, 0)); unary_expression (TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
break; break;
} }
/* Fall through */ /* Fall through */
case ALIGNOF_EXPR: case ALIGNOF_EXPR:
pp_cxx_ws_string (pp, code == SIZEOF_EXPR ? "sizeof" : "__alignof__"); pp_cxx_ws_string (this, code == SIZEOF_EXPR ? "sizeof" : "__alignof__");
pp_cxx_whitespace (pp); pp_cxx_whitespace (this);
if (TREE_CODE (t) == SIZEOF_EXPR && SIZEOF_EXPR_TYPE_P (t)) if (TREE_CODE (t) == SIZEOF_EXPR && SIZEOF_EXPR_TYPE_P (t))
{ {
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
pp_cxx_type_id (pp, TREE_TYPE (TREE_OPERAND (t, 0))); pp_cxx_type_id (this, TREE_TYPE (TREE_OPERAND (t, 0)));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
} }
else if (TYPE_P (TREE_OPERAND (t, 0))) else if (TYPE_P (TREE_OPERAND (t, 0)))
{ {
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
pp_cxx_type_id (pp, TREE_OPERAND (t, 0)); pp_cxx_type_id (this, TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
} }
else else
pp_unary_expression (pp, TREE_OPERAND (t, 0)); unary_expression (TREE_OPERAND (t, 0));
break; break;
case AT_ENCODE_EXPR: case AT_ENCODE_EXPR:
pp_cxx_ws_string (pp, "@encode"); pp_cxx_ws_string (this, "@encode");
pp_cxx_whitespace (pp); pp_cxx_whitespace (this);
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
pp_cxx_type_id (pp, TREE_OPERAND (t, 0)); pp_cxx_type_id (this, TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
break; break;
case NOEXCEPT_EXPR: case NOEXCEPT_EXPR:
pp_cxx_ws_string (pp, "noexcept"); pp_cxx_ws_string (this, "noexcept");
pp_cxx_whitespace (pp); pp_cxx_whitespace (this);
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
pp_cxx_expression (pp, TREE_OPERAND (t, 0)); expression (TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
break; break;
case UNARY_PLUS_EXPR: case UNARY_PLUS_EXPR:
pp_plus (pp); pp_plus (this);
pp_cxx_cast_expression (pp, TREE_OPERAND (t, 0)); pp_cxx_cast_expression (this, TREE_OPERAND (t, 0));
break; break;
default: default:
pp_c_unary_expression (pp, t); c_pretty_printer::unary_expression (t);
break; break;
} }
} }
...@@ -899,8 +897,8 @@ pp_cxx_pm_expression (cxx_pretty_printer *pp, tree t) ...@@ -899,8 +897,8 @@ pp_cxx_pm_expression (cxx_pretty_printer *pp, tree t)
multiplicative-expression / pm-expression multiplicative-expression / pm-expression
multiplicative-expression % pm-expression */ multiplicative-expression % pm-expression */
static void void
pp_cxx_multiplicative_expression (cxx_pretty_printer *pp, tree e) cxx_pretty_printer::multiplicative_expression (tree e)
{ {
enum tree_code code = TREE_CODE (e); enum tree_code code = TREE_CODE (e);
switch (code) switch (code)
...@@ -908,20 +906,20 @@ pp_cxx_multiplicative_expression (cxx_pretty_printer *pp, tree e) ...@@ -908,20 +906,20 @@ pp_cxx_multiplicative_expression (cxx_pretty_printer *pp, tree e)
case MULT_EXPR: case MULT_EXPR:
case TRUNC_DIV_EXPR: case TRUNC_DIV_EXPR:
case TRUNC_MOD_EXPR: case TRUNC_MOD_EXPR:
pp_cxx_multiplicative_expression (pp, TREE_OPERAND (e, 0)); multiplicative_expression (TREE_OPERAND (e, 0));
pp_space (pp); pp_space (this);
if (code == MULT_EXPR) if (code == MULT_EXPR)
pp_star (pp); pp_star (this);
else if (code == TRUNC_DIV_EXPR) else if (code == TRUNC_DIV_EXPR)
pp_slash (pp); pp_slash (this);
else else
pp_modulo (pp); pp_modulo (this);
pp_space (pp); pp_space (this);
pp_cxx_pm_expression (pp, TREE_OPERAND (e, 1)); pp_cxx_pm_expression (this, TREE_OPERAND (e, 1));
break; break;
default: default:
pp_cxx_pm_expression (pp, e); pp_cxx_pm_expression (this, e);
break; break;
} }
} }
...@@ -930,21 +928,21 @@ pp_cxx_multiplicative_expression (cxx_pretty_printer *pp, tree e) ...@@ -930,21 +928,21 @@ pp_cxx_multiplicative_expression (cxx_pretty_printer *pp, tree e)
logical-or-expression logical-or-expression
logical-or-expression ? expression : assignment-expression */ logical-or-expression ? expression : assignment-expression */
static void void
pp_cxx_conditional_expression (cxx_pretty_printer *pp, tree e) cxx_pretty_printer::conditional_expression (tree e)
{ {
if (TREE_CODE (e) == COND_EXPR) if (TREE_CODE (e) == COND_EXPR)
{ {
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0)); pp_c_logical_or_expression (this, TREE_OPERAND (e, 0));
pp_space (pp); pp_space (this);
pp_question (pp); pp_question (this);
pp_space (pp); pp_space (this);
pp_cxx_expression (pp, TREE_OPERAND (e, 1)); expression (TREE_OPERAND (e, 1));
pp_space (pp); pp_space (this);
pp_cxx_assignment_expression (pp, TREE_OPERAND (e, 2)); assignment_expression (TREE_OPERAND (e, 2));
} }
else else
pp_c_logical_or_expression (pp, e); pp_c_logical_or_expression (this, e);
} }
/* Pretty-print a compound assignment operator token as indicated by T. */ /* Pretty-print a compound assignment operator token as indicated by T. */
...@@ -996,40 +994,40 @@ pp_cxx_assignment_operator (cxx_pretty_printer *pp, tree t) ...@@ -996,40 +994,40 @@ pp_cxx_assignment_operator (cxx_pretty_printer *pp, tree t)
assignment-operator: one of assignment-operator: one of
= *= /= %= += -= >>= <<= &= ^= |= */ = *= /= %= += -= >>= <<= &= ^= |= */
static void void
pp_cxx_assignment_expression (cxx_pretty_printer *pp, tree e) cxx_pretty_printer::assignment_expression (tree e)
{ {
switch (TREE_CODE (e)) switch (TREE_CODE (e))
{ {
case MODIFY_EXPR: case MODIFY_EXPR:
case INIT_EXPR: case INIT_EXPR:
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0)); pp_c_logical_or_expression (this, TREE_OPERAND (e, 0));
pp_space (pp); pp_space (this);
pp_equal (pp); pp_equal (this);
pp_space (pp); pp_space (this);
pp_cxx_assignment_expression (pp, TREE_OPERAND (e, 1)); assignment_expression (TREE_OPERAND (e, 1));
break; break;
case THROW_EXPR: case THROW_EXPR:
pp_cxx_ws_string (pp, "throw"); pp_cxx_ws_string (this, "throw");
if (TREE_OPERAND (e, 0)) if (TREE_OPERAND (e, 0))
pp_cxx_assignment_expression (pp, TREE_OPERAND (e, 0)); assignment_expression (TREE_OPERAND (e, 0));
break; break;
case MODOP_EXPR: case MODOP_EXPR:
pp_c_logical_or_expression (pp, TREE_OPERAND (e, 0)); pp_c_logical_or_expression (this, TREE_OPERAND (e, 0));
pp_cxx_assignment_operator (pp, TREE_OPERAND (e, 1)); pp_cxx_assignment_operator (this, TREE_OPERAND (e, 1));
pp_cxx_assignment_expression (pp, TREE_OPERAND (e, 2)); assignment_expression (TREE_OPERAND (e, 2));
break; break;
default: default:
pp_cxx_conditional_expression (pp, e); conditional_expression (e);
break; break;
} }
} }
static void void
pp_cxx_expression (cxx_pretty_printer *pp, tree t) cxx_pretty_printer::expression (tree t)
{ {
switch (TREE_CODE (t)) switch (TREE_CODE (t))
{ {
...@@ -1037,15 +1035,15 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t) ...@@ -1037,15 +1035,15 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
case INTEGER_CST: case INTEGER_CST:
case REAL_CST: case REAL_CST:
case COMPLEX_CST: case COMPLEX_CST:
pp_constant (pp, t); constant (t);
break; break;
case USERDEF_LITERAL: case USERDEF_LITERAL:
pp_cxx_userdef_literal (pp, t); pp_cxx_userdef_literal (this, t);
break; break;
case RESULT_DECL: case RESULT_DECL:
pp_cxx_unqualified_id (pp, t); pp_cxx_unqualified_id (this, t);
break; break;
#if 0 #if 0
...@@ -1053,7 +1051,7 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t) ...@@ -1053,7 +1051,7 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
#endif #endif
case SCOPE_REF: case SCOPE_REF:
case PTRMEM_CST: case PTRMEM_CST:
pp_cxx_qualified_id (pp, t); pp_cxx_qualified_id (this, t);
break; break;
case OVERLOAD: case OVERLOAD:
...@@ -1069,7 +1067,7 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t) ...@@ -1069,7 +1067,7 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
case TEMPLATE_PARM_INDEX: case TEMPLATE_PARM_INDEX:
case TEMPLATE_TEMPLATE_PARM: case TEMPLATE_TEMPLATE_PARM:
case STMT_EXPR: case STMT_EXPR:
pp_primary_expression (pp, t); primary_expression (t);
break; break;
case CALL_EXPR: case CALL_EXPR:
...@@ -1085,65 +1083,65 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t) ...@@ -1085,65 +1083,65 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
case PSEUDO_DTOR_EXPR: case PSEUDO_DTOR_EXPR:
case AGGR_INIT_EXPR: case AGGR_INIT_EXPR:
case ARROW_EXPR: case ARROW_EXPR:
pp_postfix_expression (pp, t); postfix_expression (t);
break; break;
case NEW_EXPR: case NEW_EXPR:
case VEC_NEW_EXPR: case VEC_NEW_EXPR:
pp_cxx_new_expression (pp, t); pp_cxx_new_expression (this, t);
break; break;
case DELETE_EXPR: case DELETE_EXPR:
case VEC_DELETE_EXPR: case VEC_DELETE_EXPR:
pp_cxx_delete_expression (pp, t); pp_cxx_delete_expression (this, t);
break; break;
case SIZEOF_EXPR: case SIZEOF_EXPR:
case ALIGNOF_EXPR: case ALIGNOF_EXPR:
case NOEXCEPT_EXPR: case NOEXCEPT_EXPR:
pp_cxx_unary_expression (pp, t); unary_expression (t);
break; break;
case CAST_EXPR: case CAST_EXPR:
case IMPLICIT_CONV_EXPR: case IMPLICIT_CONV_EXPR:
pp_cxx_cast_expression (pp, t); pp_cxx_cast_expression (this, t);
break; break;
case OFFSET_REF: case OFFSET_REF:
case MEMBER_REF: case MEMBER_REF:
case DOTSTAR_EXPR: case DOTSTAR_EXPR:
pp_cxx_pm_expression (pp, t); pp_cxx_pm_expression (this, t);
break; break;
case MULT_EXPR: case MULT_EXPR:
case TRUNC_DIV_EXPR: case TRUNC_DIV_EXPR:
case TRUNC_MOD_EXPR: case TRUNC_MOD_EXPR:
pp_cxx_multiplicative_expression (pp, t); multiplicative_expression (t);
break; break;
case COND_EXPR: case COND_EXPR:
pp_cxx_conditional_expression (pp, t); conditional_expression (t);
break; break;
case MODIFY_EXPR: case MODIFY_EXPR:
case INIT_EXPR: case INIT_EXPR:
case THROW_EXPR: case THROW_EXPR:
case MODOP_EXPR: case MODOP_EXPR:
pp_cxx_assignment_expression (pp, t); assignment_expression (t);
break; break;
case NON_DEPENDENT_EXPR: case NON_DEPENDENT_EXPR:
case MUST_NOT_THROW_EXPR: case MUST_NOT_THROW_EXPR:
pp_cxx_expression (pp, TREE_OPERAND (t, 0)); expression (TREE_OPERAND (t, 0));
break; break;
case EXPR_PACK_EXPANSION: case EXPR_PACK_EXPANSION:
pp_cxx_expression (pp, PACK_EXPANSION_PATTERN (t)); expression (PACK_EXPANSION_PATTERN (t));
pp_cxx_ws_string (pp, "..."); pp_cxx_ws_string (this, "...");
break; break;
case TEMPLATE_ID_EXPR: case TEMPLATE_ID_EXPR:
pp_cxx_template_id (pp, t); pp_cxx_template_id (this, t);
break; break;
case NONTYPE_ARGUMENT_PACK: case NONTYPE_ARGUMENT_PACK:
...@@ -1153,24 +1151,24 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t) ...@@ -1153,24 +1151,24 @@ pp_cxx_expression (cxx_pretty_printer *pp, tree t)
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
{ {
if (i > 0) if (i > 0)
pp_cxx_separate_with (pp, ','); pp_cxx_separate_with (this, ',');
pp_cxx_expression (pp, TREE_VEC_ELT (args, i)); expression (TREE_VEC_ELT (args, i));
} }
} }
break; break;
case LAMBDA_EXPR: case LAMBDA_EXPR:
pp_cxx_ws_string (pp, "<lambda>"); pp_cxx_ws_string (this, "<lambda>");
break; break;
case PAREN_EXPR: case PAREN_EXPR:
pp_cxx_left_paren (pp); pp_cxx_left_paren (this);
pp_cxx_expression (pp, TREE_OPERAND (t, 0)); expression (TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (this);
break; break;
default: default:
pp_c_expression (pp, t); c_pretty_printer::expression (t);
break; break;
} }
} }
...@@ -1321,7 +1319,7 @@ pp_cxx_type_specifier_seq (cxx_pretty_printer *pp, tree t) ...@@ -1321,7 +1319,7 @@ pp_cxx_type_specifier_seq (cxx_pretty_printer *pp, tree t)
case DECLTYPE_TYPE: case DECLTYPE_TYPE:
pp_cxx_ws_string (pp, "decltype"); pp_cxx_ws_string (pp, "decltype");
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, DECLTYPE_TYPE_EXPR (t)); pp_expression (pp, DECLTYPE_TYPE_EXPR (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
break; break;
...@@ -1450,7 +1448,7 @@ pp_cxx_parameter_declaration_clause (cxx_pretty_printer *pp, tree t) ...@@ -1450,7 +1448,7 @@ pp_cxx_parameter_declaration_clause (cxx_pretty_printer *pp, tree t)
pp_cxx_whitespace (pp); pp_cxx_whitespace (pp);
pp_equal (pp); pp_equal (pp);
pp_cxx_whitespace (pp); pp_cxx_whitespace (pp);
pp_cxx_assignment_expression (pp, TREE_PURPOSE (types)); pp_assignment_expression (pp, TREE_PURPOSE (types));
} }
} }
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
...@@ -1479,7 +1477,7 @@ pp_cxx_exception_specification (cxx_pretty_printer *pp, tree t) ...@@ -1479,7 +1477,7 @@ pp_cxx_exception_specification (cxx_pretty_printer *pp, tree t)
if (DEFERRED_NOEXCEPT_SPEC_P (ex_spec)) if (DEFERRED_NOEXCEPT_SPEC_P (ex_spec))
pp_cxx_ws_string (pp, "<uninstantiated>"); pp_cxx_ws_string (pp, "<uninstantiated>");
else else
pp_cxx_expression (pp, TREE_PURPOSE (ex_spec)); pp_expression (pp, TREE_PURPOSE (ex_spec));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
return; return;
} }
...@@ -1788,7 +1786,7 @@ pp_cxx_template_argument_list (cxx_pretty_printer *pp, tree t) ...@@ -1788,7 +1786,7 @@ pp_cxx_template_argument_list (cxx_pretty_printer *pp, tree t)
&& TYPE_P (DECL_TEMPLATE_RESULT (arg)))) && TYPE_P (DECL_TEMPLATE_RESULT (arg))))
pp_cxx_type_id (pp, arg); pp_cxx_type_id (pp, arg);
else else
pp_cxx_expression (pp, arg); pp_expression (pp, arg);
} }
} }
} }
...@@ -1877,7 +1875,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1877,7 +1875,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
pp_cxx_ws_string (pp, "if"); pp_cxx_ws_string (pp, "if");
pp_cxx_whitespace (pp); pp_cxx_whitespace (pp);
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, IF_COND (t)); pp_expression (pp, IF_COND (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
pp_newline_and_indent (pp, 2); pp_newline_and_indent (pp, 2);
pp_cxx_statement (pp, THEN_CLAUSE (t)); pp_cxx_statement (pp, THEN_CLAUSE (t));
...@@ -1900,7 +1898,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1900,7 +1898,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
pp_cxx_ws_string (pp, "switch"); pp_cxx_ws_string (pp, "switch");
pp_space (pp); pp_space (pp);
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, SWITCH_STMT_COND (t)); pp_expression (pp, SWITCH_STMT_COND (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
pp_indentation (pp) += 3; pp_indentation (pp) += 3;
pp_needs_newline (pp) = true; pp_needs_newline (pp) = true;
...@@ -1917,7 +1915,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1917,7 +1915,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
pp_cxx_ws_string (pp, "while"); pp_cxx_ws_string (pp, "while");
pp_space (pp); pp_space (pp);
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, WHILE_COND (t)); pp_expression (pp, WHILE_COND (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
pp_newline_and_indent (pp, 3); pp_newline_and_indent (pp, 3);
pp_cxx_statement (pp, WHILE_BODY (t)); pp_cxx_statement (pp, WHILE_BODY (t));
...@@ -1933,7 +1931,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1933,7 +1931,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
pp_cxx_ws_string (pp, "while"); pp_cxx_ws_string (pp, "while");
pp_space (pp); pp_space (pp);
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, DO_COND (t)); pp_expression (pp, DO_COND (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
pp_cxx_semicolon (pp); pp_cxx_semicolon (pp);
pp_needs_newline (pp) = true; pp_needs_newline (pp) = true;
...@@ -1950,12 +1948,12 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1950,12 +1948,12 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
pp_needs_newline (pp) = false; pp_needs_newline (pp) = false;
pp_cxx_whitespace (pp); pp_cxx_whitespace (pp);
if (FOR_COND (t)) if (FOR_COND (t))
pp_cxx_expression (pp, FOR_COND (t)); pp_expression (pp, FOR_COND (t));
pp_cxx_semicolon (pp); pp_cxx_semicolon (pp);
pp_needs_newline (pp) = false; pp_needs_newline (pp) = false;
pp_cxx_whitespace (pp); pp_cxx_whitespace (pp);
if (FOR_EXPR (t)) if (FOR_EXPR (t))
pp_cxx_expression (pp, FOR_EXPR (t)); pp_expression (pp, FOR_EXPR (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
pp_newline_and_indent (pp, 3); pp_newline_and_indent (pp, 3);
pp_cxx_statement (pp, FOR_BODY (t)); pp_cxx_statement (pp, FOR_BODY (t));
...@@ -1994,7 +1992,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t) ...@@ -1994,7 +1992,7 @@ pp_cxx_statement (cxx_pretty_printer *pp, tree t)
/* expression-statement: /* expression-statement:
expression(opt) ; */ expression(opt) ; */
case EXPR_STMT: case EXPR_STMT:
pp_cxx_expression (pp, EXPR_STMT_EXPR (t)); pp_expression (pp, EXPR_STMT_EXPR (t));
pp_cxx_semicolon (pp); pp_cxx_semicolon (pp);
pp_needs_newline (pp) = true; pp_needs_newline (pp) = true;
break; break;
...@@ -2218,9 +2216,9 @@ pp_cxx_declaration (cxx_pretty_printer *pp, tree t) ...@@ -2218,9 +2216,9 @@ pp_cxx_declaration (cxx_pretty_printer *pp, tree t)
{ {
pp_cxx_ws_string (pp, "static_assert"); pp_cxx_ws_string (pp, "static_assert");
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_expression (pp, STATIC_ASSERT_CONDITION (t)); pp_expression (pp, STATIC_ASSERT_CONDITION (t));
pp_cxx_separate_with (pp, ','); pp_cxx_separate_with (pp, ',');
pp_cxx_expression (pp, STATIC_ASSERT_MESSAGE (t)); pp_expression (pp, STATIC_ASSERT_MESSAGE (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
} }
else if (!DECL_LANG_SPECIFIC (t)) else if (!DECL_LANG_SPECIFIC (t))
...@@ -2279,7 +2277,7 @@ pp_cxx_typeid_expression (cxx_pretty_printer *pp, tree t) ...@@ -2279,7 +2277,7 @@ pp_cxx_typeid_expression (cxx_pretty_printer *pp, tree t)
if (TYPE_P (t)) if (TYPE_P (t))
pp_cxx_type_id (pp, t); pp_cxx_type_id (pp, t);
else else
pp_cxx_expression (pp, t); pp_expression (pp, t);
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
} }
...@@ -2288,7 +2286,7 @@ pp_cxx_va_arg_expression (cxx_pretty_printer *pp, tree t) ...@@ -2288,7 +2286,7 @@ pp_cxx_va_arg_expression (cxx_pretty_printer *pp, tree t)
{ {
pp_cxx_ws_string (pp, "va_arg"); pp_cxx_ws_string (pp, "va_arg");
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
pp_cxx_assignment_expression (pp, TREE_OPERAND (t, 0)); pp_assignment_expression (pp, TREE_OPERAND (t, 0));
pp_cxx_separate_with (pp, ','); pp_cxx_separate_with (pp, ',');
pp_cxx_type_id (pp, TREE_TYPE (t)); pp_cxx_type_id (pp, TREE_TYPE (t));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
...@@ -2313,13 +2311,13 @@ pp_cxx_offsetof_expression_1 (cxx_pretty_printer *pp, tree t) ...@@ -2313,13 +2311,13 @@ pp_cxx_offsetof_expression_1 (cxx_pretty_printer *pp, tree t)
return false; return false;
if (TREE_CODE (TREE_OPERAND (t, 0)) != ARROW_EXPR) if (TREE_CODE (TREE_OPERAND (t, 0)) != ARROW_EXPR)
pp_cxx_dot (pp); pp_cxx_dot (pp);
pp_cxx_expression (pp, TREE_OPERAND (t, 1)); pp_expression (pp, TREE_OPERAND (t, 1));
return true; return true;
case ARRAY_REF: case ARRAY_REF:
if (!pp_cxx_offsetof_expression_1 (pp, TREE_OPERAND (t, 0))) if (!pp_cxx_offsetof_expression_1 (pp, TREE_OPERAND (t, 0)))
return false; return false;
pp_left_bracket (pp); pp_left_bracket (pp);
pp_cxx_expression (pp, TREE_OPERAND (t, 1)); pp_expression (pp, TREE_OPERAND (t, 1));
pp_right_bracket (pp); pp_right_bracket (pp);
return true; return true;
default: default:
...@@ -2333,7 +2331,7 @@ pp_cxx_offsetof_expression (cxx_pretty_printer *pp, tree t) ...@@ -2333,7 +2331,7 @@ pp_cxx_offsetof_expression (cxx_pretty_printer *pp, tree t)
pp_cxx_ws_string (pp, "offsetof"); pp_cxx_ws_string (pp, "offsetof");
pp_cxx_left_paren (pp); pp_cxx_left_paren (pp);
if (!pp_cxx_offsetof_expression_1 (pp, TREE_OPERAND (t, 0))) if (!pp_cxx_offsetof_expression_1 (pp, TREE_OPERAND (t, 0)))
pp_cxx_expression (pp, TREE_OPERAND (t, 0)); pp_expression (pp, TREE_OPERAND (t, 0));
pp_cxx_right_paren (pp); pp_cxx_right_paren (pp);
} }
...@@ -2447,10 +2445,4 @@ cxx_pretty_printer::cxx_pretty_printer () ...@@ -2447,10 +2445,4 @@ cxx_pretty_printer::cxx_pretty_printer ()
simple_type_specifier = (pp_fun) pp_cxx_simple_type_specifier; simple_type_specifier = (pp_fun) pp_cxx_simple_type_specifier;
/* pp->statement = (pp_fun) pp_cxx_statement; */ /* pp->statement = (pp_fun) pp_cxx_statement; */
unary_expression = (pp_fun) pp_cxx_unary_expression;
multiplicative_expression = (pp_fun) pp_cxx_multiplicative_expression;
conditional_expression = (pp_fun) pp_cxx_conditional_expression;
assignment_expression = (pp_fun) pp_cxx_assignment_expression;
expression = (pp_fun) pp_cxx_expression;
} }
gcc/cp/cxx-pretty-print.h
...@@ -37,6 +37,11 @@ struct cxx_pretty_printer : c_pretty_printer ...@@ -37,6 +37,11 @@ struct cxx_pretty_printer : c_pretty_printer
void id_expression (tree); void id_expression (tree);
void primary_expression (tree); void primary_expression (tree);
void postfix_expression (tree); void postfix_expression (tree);
void unary_expression (tree);
void multiplicative_expression (tree);
void conditional_expression (tree);
void assignment_expression (tree);
void expression (tree);
/* This is the enclosing scope of the entity being pretty-printed. */ /* This is the enclosing scope of the entity being pretty-printed. */
tree enclosing_scope; tree enclosing_scope;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment