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

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>
 
 	* c-pretty-print.h (c_pretty_printer::postfix_expression): Now a

gcc/c-family/c-pretty-print.h

@@ -58,6 +58,11 @@ struct c_pretty_printer : pretty_printer
   virtual void id_expression (tree);
   virtual void primary_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.
      Not used yet.  */
   int *offset_list;
@@ -83,11 +88,6 @@ struct c_pretty_printer : pretty_printer
 
   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)              \
@@ -116,13 +116,13 @@ struct c_pretty_printer : pretty_printer
 #define pp_id_expression(PP, E)         (PP)->id_expression (E)
 #define pp_primary_expression(PP, E)    (PP)->primary_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_multiplicative_expression(PP, E)      \
-  (PP)->multiplicative_expression (PP, E)
-#define pp_conditional_expression(PP, E) (PP)->conditional_expression (PP, E)
-#define pp_assignment_expression(PP, E) (PP)->assignment_expression (PP, E)
-#define pp_expression(PP, E)            (PP)->expression (PP, E)
+  (PP)->multiplicative_expression (E)
+#define pp_conditional_expression(PP, E) (PP)->conditional_expression (E)
+#define pp_assignment_expression(PP, E) (PP)->assignment_expression (E)
+#define pp_expression(PP, E)            (PP)->expression (E)
 
 
 void pp_c_whitespace (c_pretty_printer *);
@@ -162,12 +162,10 @@ void pp_c_storage_class_specifier (c_pretty_printer *, tree);
 /* Statements.  */
 void pp_c_statement (c_pretty_printer *, tree);
 /* Expressions.  */
-void pp_c_expression (c_pretty_printer *, tree);
 void pp_c_logical_or_expression (c_pretty_printer *, tree);
 void pp_c_expression_list (c_pretty_printer *, tree);
 void pp_c_constructor_elts (c_pretty_printer *, vec<constructor_elt, va_gc> *);
 void pp_c_call_argument_list (c_pretty_printer *, tree);
-void pp_c_unary_expression (c_pretty_printer *, tree);
 void pp_c_cast_expression (c_pretty_printer *, tree);
 void pp_c_init_declarator (c_pretty_printer *, tree);
 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>
 
 	* cxx-pretty-print.h (cxx_pretty_printer::postfix_expression):

gcc/cp/cxx-pretty-print.h

@@ -37,6 +37,11 @@ struct cxx_pretty_printer : c_pretty_printer
   void id_expression (tree);
   void primary_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.  */
   tree enclosing_scope;
 };