Merge in trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@202265 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 30 insertions, 70 deletions

diff --git a/gcc/c-family/c-pretty-print.h b/gcc/c-family/c-pretty-print.h
index 390477d289e..aa046e51dad 100644
--- a/gcc/c-family/c-pretty-print.h
+++ b/gcc/c-family/c-pretty-print.h
@@ -49,6 +49,35 @@ typedef void (*c_pretty_print_fn) (c_pretty_printer *, tree);
    and cp/cxx-pretty-print.c for an example of derivation.  */
 struct c_pretty_printer : pretty_printer
 {
+  c_pretty_printer ();
+
+  // Format string, possibly translated.
+  void translate_string (const char *);
+
+  virtual void constant (tree);
+  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);
+
+  virtual void type_id (tree);
+  virtual void statement (tree);
+
+  virtual void declaration (tree);
+  virtual void declaration_specifiers (tree);
+  virtual void simple_type_specifier (tree);
+  virtual void function_specifier (tree);
+  virtual void storage_class_specifier (tree);
+  virtual void declarator (tree);
+  virtual void direct_declarator (tree);
+  virtual void abstract_declarator (tree);
+  virtual void direct_abstract_declarator (tree);
+
+  virtual void initializer (tree);
   /* Points to the first element of an array of offset-list.
      Not used yet.  */
   int *offset_list;
@@ -57,70 +86,18 @@ struct c_pretty_printer : pretty_printer
 
   /* These must be overridden by each of the C and C++ front-end to
      reflect their understanding of syntactic productions when they differ.  */
-  c_pretty_print_fn declaration;
-  c_pretty_print_fn declaration_specifiers;
-  c_pretty_print_fn declarator;
-  c_pretty_print_fn abstract_declarator;
-  c_pretty_print_fn direct_abstract_declarator;
   c_pretty_print_fn type_specifier_seq;
-  c_pretty_print_fn direct_declarator;
   c_pretty_print_fn ptr_operator;
   c_pretty_print_fn parameter_list;
-  c_pretty_print_fn type_id;
-  c_pretty_print_fn simple_type_specifier;
-  c_pretty_print_fn function_specifier;
-  c_pretty_print_fn storage_class_specifier;
-  c_pretty_print_fn initializer;
-
-  c_pretty_print_fn statement;
-
-  c_pretty_print_fn constant;
-  c_pretty_print_fn id_expression;
-  c_pretty_print_fn primary_expression;
-  c_pretty_print_fn postfix_expression;
-  c_pretty_print_fn unary_expression;
-  c_pretty_print_fn multiplicative_expression;
-  c_pretty_print_fn conditional_expression;
-  c_pretty_print_fn assignment_expression;
-  c_pretty_print_fn expression;
 };
 
 #define pp_c_tree_identifier(PPI, ID)              \
    pp_c_identifier (PPI, IDENTIFIER_POINTER (ID))
 
-#define pp_declaration(PP, T)           (PP)->declaration (PP, T)
-#define pp_declaration_specifiers(PP, D)         \
-   (PP)->declaration_specifiers (PP, D)
-#define pp_abstract_declarator(PP, D)   (PP)->abstract_declarator (PP, D)
 #define pp_type_specifier_seq(PP, D)    (PP)->type_specifier_seq (PP, D)
-#define pp_declarator(PP, D)            (PP)->declarator (PP, D)
-#define pp_direct_declarator(PP, D)     (PP)->direct_declarator (PP, D)
-#define pp_direct_abstract_declarator(PP, D)      \
-   (PP)->direct_abstract_declarator (PP, D)
 #define pp_ptr_operator(PP, D)          (PP)->ptr_operator (PP, D)
 #define pp_parameter_list(PP, T)        (PP)->parameter_list (PP, T)
-#define pp_type_id(PP, D)               (PP)->type_id (PP, D)
-#define pp_simple_type_specifier(PP, T) (PP)->simple_type_specifier (PP, T)
-#define pp_function_specifier(PP, D)    (PP)->function_specifier (PP, D)
-#define pp_storage_class_specifier(PP, D)         \
-  (PP)->storage_class_specifier (PP, D);
-
-#define pp_statement(PP, S)             (PP)->statement (PP, S)
-
-#define pp_constant(PP, E)              (PP)->constant (PP, E)
-#define pp_id_expression(PP, E)         (PP)->id_expression (PP, E)
-#define pp_primary_expression(PP, E)    (PP)->primary_expression (PP, E)
-#define pp_postfix_expression(PP, E)    (PP)->postfix_expression (PP, E)
-#define pp_unary_expression(PP, E)      (PP)->unary_expression (PP, 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)
-
-
-extern void pp_c_pretty_printer_init (c_pretty_printer *);
+
 void pp_c_whitespace (c_pretty_printer *);
 void pp_c_left_paren (c_pretty_printer *);
 void pp_c_right_paren (c_pretty_printer *);
@@ -145,31 +122,14 @@ void pp_c_attributes_display (c_pretty_printer *, tree);
 void pp_c_cv_qualifiers (c_pretty_printer *pp, int qualifiers, bool func_type);
 void pp_c_type_qualifier_list (c_pretty_printer *, tree);
 void pp_c_parameter_type_list (c_pretty_printer *, tree);
-void pp_c_declaration (c_pretty_printer *, tree);
-void pp_c_declaration_specifiers (c_pretty_printer *, tree);
-void pp_c_declarator (c_pretty_printer *, tree);
-void pp_c_direct_declarator (c_pretty_printer *, tree);
 void pp_c_specifier_qualifier_list (c_pretty_printer *, tree);
-void pp_c_function_specifier (c_pretty_printer *, tree);
-void pp_c_type_id (c_pretty_printer *, tree);
-void pp_c_direct_abstract_declarator (c_pretty_printer *, tree);
-void pp_c_type_specifier (c_pretty_printer *, tree);
-void pp_c_storage_class_specifier (c_pretty_printer *, tree);
-/* Statements.  */
-void pp_c_statement (c_pretty_printer *, tree);
 /* Expressions.  */
-void pp_c_expression (c_pretty_printer *, tree);
 void pp_c_logical_or_expression (c_pretty_printer *, tree);
 void pp_c_expression_list (c_pretty_printer *, tree);
 void pp_c_constructor_elts (c_pretty_printer *, vec<constructor_elt, 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_postfix_expression (c_pretty_printer *, tree);
-void pp_c_primary_expression (c_pretty_printer *, tree);
 void pp_c_init_declarator (c_pretty_printer *, tree);
-void pp_c_constant (c_pretty_printer *, tree);
-void pp_c_id_expression (c_pretty_printer *, tree);
 void pp_c_ws_string (c_pretty_printer *, const char *);
 void pp_c_identifier (c_pretty_printer *, const char *);
 void pp_c_string_literal (c_pretty_printer *, tree);