c-pretty-print.c: #include "c-tree.h".

        * c-pretty-print.c: #include "c-tree.h".
        (pp_c_simple_type_specifier): Tweak.
        (pp_c_storage_class_specifier): New.
        (pp_c_function_specifier): Likewise.
        (pp_c_declaration_specifiers): Likewise.
        (pp_c_init_declarator): Likewise.
        (pp_c_declaration): Likewise.
        (pp_c_direct_declarator): Stub.
        (pp_c_declarator): Likewise.
        (pp_c_parameter_declaration): Likewise.

From-SVN: r56240

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 143cef9..e125b61 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-13  Gabriel Dos Reis  <gdr@nerim.net>
+
+       * c-pretty-print.c: #include "c-tree.h".
+       (pp_c_simple_type_specifier): Tweak.
+       (pp_c_storage_class_specifier): New.
+       (pp_c_function_specifier): Likewise.
+       (pp_c_declaration_specifiers): Likewise.
+       (pp_c_init_declarator): Likewise.
+       (pp_c_declaration): Likewise.
+       (pp_c_direct_declarator): Stub.
+       (pp_c_declarator): Likewise.
+       (pp_c_parameter_declaration): Likewise.
+
 2002-08-13  Neil Booth  <neil@daikokuya.co.uk>
 
        * c-opts.c (deps_seen, deps_file, deferred_count, deferred_size,

diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c
index 18e22f0..34498ad 100644 (file)
--- a/gcc/c-pretty-print.c
+++ b/gcc/c-pretty-print.c
@@ -23,50 +23,57 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "system.h"
 #include "real.h"
 #include "c-pretty-print.h"
+#include "c-tree.h"
 
 /* literal  */
-static void pp_c_char              PARAMS ((c_pretty_print_info *, int));
-static void pp_c_character_literal PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_bool_literal      PARAMS ((c_pretty_print_info *, tree));
-static bool pp_c_enumerator        PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_integer_literal   PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_real_literal      PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_string_literal    PARAMS ((c_pretty_print_info *, tree));
+static void pp_c_char              PARAMS ((c_pretty_printer, int));
+static void pp_c_character_literal PARAMS ((c_pretty_printer, tree));
+static void pp_c_bool_literal      PARAMS ((c_pretty_printer, tree));
+static bool pp_c_enumerator        PARAMS ((c_pretty_printer, tree));
+static void pp_c_integer_literal   PARAMS ((c_pretty_printer, tree));
+static void pp_c_real_literal      PARAMS ((c_pretty_printer, tree));
+static void pp_c_string_literal    PARAMS ((c_pretty_printer, tree));
 
-static void pp_c_primary_expression PARAMS ((c_pretty_print_info *, tree));
+static void pp_c_primary_expression PARAMS ((c_pretty_printer, tree));
 
 /* postfix-expression  */
-static void pp_c_initializer_list PARAMS ((c_pretty_print_info *, tree));
-
-static void pp_c_unary_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_multiplicative_expression PARAMS ((c_pretty_print_info *,
-                                                   tree));
-static void pp_c_additive_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_shift_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_relational_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_equality_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_and_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_exclusive_or_expression PARAMS ((c_pretty_print_info *,
+static void pp_c_initializer_list        PARAMS ((c_pretty_printer, tree));
+
+static void pp_c_unary_expression        PARAMS ((c_pretty_printer, tree));
+static void pp_c_multiplicative_expression PARAMS ((c_pretty_printer, tree));
+static void pp_c_additive_expression     PARAMS ((c_pretty_printer, tree));
+static void pp_c_shift_expression        PARAMS ((c_pretty_printer, tree));
+static void pp_c_relational_expression   PARAMS ((c_pretty_printer, tree));
+static void pp_c_equality_expression     PARAMS ((c_pretty_printer, tree));
+static void pp_c_and_expression          PARAMS ((c_pretty_printer, tree));
+static void pp_c_exclusive_or_expression PARAMS ((c_pretty_printer,
                                                  tree));
-static void pp_c_inclusive_or_expression PARAMS ((c_pretty_print_info *,
+static void pp_c_inclusive_or_expression PARAMS ((c_pretty_printer,
                                                  tree));
-static void pp_c_logical_and_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_conditional_expression PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_assignment_expression PARAMS ((c_pretty_print_info *, tree));
+static void pp_c_logical_and_expression PARAMS ((c_pretty_printer, tree));
+static void pp_c_conditional_expression PARAMS ((c_pretty_printer, tree));
+static void pp_c_assignment_expression  PARAMS ((c_pretty_printer, tree));
 
 /* declarations.  */
-static void pp_c_specifier_qualifier_list PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_type_specifier PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_abstract_declarator PARAMS ((c_pretty_print_info *, tree));
-static void pp_c_type_id PARAMS ((c_pretty_print_info *, tree));
+static void pp_c_declaration_specifiers   PARAMS ((c_pretty_printer, tree));
+static void pp_c_init_declarator          PARAMS ((c_pretty_printer, tree));
+static void pp_c_declarator               PARAMS ((c_pretty_printer, tree));
+static void pp_c_direct_declarator        PARAMS ((c_pretty_printer, tree));
+static void pp_c_abstract_declarator      PARAMS ((c_pretty_printer, tree));
+static void pp_c_specifier_qualifier_list PARAMS ((c_pretty_printer, tree));
+static void pp_c_simple_type_specifier    PARAMS ((c_pretty_printer, tree));
+static void pp_c_parameter_declaration    PARAMS ((c_pretty_printer, tree));
+static void pp_c_type_id                  PARAMS ((c_pretty_printer, tree));
+static void pp_c_storage_class_specifier  PARAMS ((c_pretty_printer, tree));
+static void pp_c_function_specifier       PARAMS ((c_pretty_printer, tree));
 
 \f
 /* Declarations.  */
 
-/* Print out CV-qualifiers.  Take care of possible extension.  */
+/* Print out CV-qualifiers.  Take care of possible extensions.  */
 void
 pp_c_cv_qualifier (ppi, cv)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      int cv;
 {
   if (cv & TYPE_QUAL_CONST)
@@ -78,15 +85,15 @@ pp_c_cv_qualifier (ppi, cv)
 }
 
 static void
-pp_c_type_specifier (ppi, t)
-     c_pretty_print_info *ppi;
+pp_c_simple_type_specifier (ppi, t)
+     c_pretty_printer ppi;
      tree t;
 {
   const enum tree_code code = TREE_CODE (t);
   switch (code)
     {
     case ERROR_MARK:
-      pp_c_identifier (ppi, "<erroneous-type>");
+      pp_c_identifier (ppi, "<type-error>");
       break;
 
 #if 0
@@ -98,25 +105,18 @@ pp_c_type_specifier (ppi, t)
     case IDENTIFIER_NODE:
       pp_c_tree_identifier (ppi, t);
       break;
-
-#if 0
-    case INTEGER_TYPE:
-      if (TREE_UNSIGNED (t))
-       pp_c_identifier (ppi, "unsigned");
-      /* fall through.  */
+      
     case VOID_TYPE:
     case BOOLEAN_TYPE:
+    case CHAR_TYPE:
+    case INTEGER_TYPE:
     case REAL_TYPE:
-      if (TYPE_NAME (t) && TYPE_IDENTIFIER (t))
-       pp_c_tree_identifier (t, TYPE_IDENTIFIER (t));
-      else
-       pp_c_identifier (ppi, "<anonymous-type>");
+      pp_c_tree_identifier (ppi, DECL_NAME (t));
       break;
-#endif
       
     case COMPLEX_TYPE:
     case VECTOR_TYPE:
-      pp_c_type_specifier (ppi, TREE_TYPE (t));
+      pp_c_simple_type_specifier (ppi, TYPE_MAIN_VARIANT (TREE_TYPE (t)));
       if (code == COMPLEX_TYPE)
        pp_c_identifier (ppi, flag_isoc99 ? "_Complex" : "__complex__");
       else if (code == VECTOR_TYPE)
@@ -124,7 +124,10 @@ pp_c_type_specifier (ppi, t)
       break;
 
     case TYPE_DECL:
-      pp_c_tree_identifier (ppi, DECL_NAME (t));
+      if (DECL_NAME (t))
+       pp_c_tree_identifier (ppi, DECL_NAME (t));
+      else
+       pp_c_identifier (ppi, "<typedef-error>");
       break;
 
     case UNION_TYPE:
@@ -136,6 +139,8 @@ pp_c_type_specifier (ppi, t)
        pp_c_identifier (ppi, "struct");
       else if (code == ENUMERAL_TYPE)
        pp_c_identifier (ppi, "enum");
+      else
+       pp_c_identifier (ppi, "<tag-error>");
       
       if (TYPE_NAME (t))
        pp_c_tree_identifier (ppi, TYPE_NAME (t));
@@ -143,12 +148,6 @@ pp_c_type_specifier (ppi, t)
        pp_c_identifier (ppi, "<anonymous>");
       break;
 
-    case POINTER_TYPE:
-    case ARRAY_TYPE:
-      {
-      }
-      break;
-      
     default:
       pp_unsupported_tree (ppi, t);
     }
@@ -156,16 +155,16 @@ pp_c_type_specifier (ppi, t)
 
 static inline void
 pp_c_specifier_qualifier_list (ppi, t)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree t;
 {
-  pp_c_type_specifier (ppi, t);
+  pp_c_simple_type_specifier (ppi, TYPE_MAIN_VARIANT (TREE_TYPE (t)));
   pp_c_cv_qualifier (ppi, TYPE_QUALS (t));
 }
 
 static void
 pp_c_abstract_declarator (ppi, t)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree t;
 {
   pp_unsupported_tree (ppi, t);
@@ -174,20 +173,99 @@ pp_c_abstract_declarator (ppi, t)
 
 static inline void
 pp_c_type_id (ppi, t)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree t;
 {
   pp_c_specifier_qualifier_list (ppi, t);
   pp_c_abstract_declarator (ppi, t);
 }
 
+static inline void
+pp_c_storage_class_specifier (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  if (TREE_CODE (t) == TYPE_DECL)
+    pp_c_identifier (pp, "typedef");
+  else if (DECL_REGISTER (t))
+    pp_c_identifier (pp, "register");
+}
+
+static inline void
+pp_c_function_specifier (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  if (TREE_CODE (t) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (t))
+    pp_c_identifier (pp, "inline");
+}
+
+static inline void
+pp_c_declaration_specifiers (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_c_storage_class_specifier (pp, t);
+  pp_c_function_specifier (pp, t);
+  pp_type_specifier (pp, TYPE_MAIN_VARIANT (TREE_TYPE (t)));
+  pp_c_cv_qualifier (pp, TYPE_QUALS (TREE_TYPE (t)));
+}
+
+static inline void
+pp_c_direct_declarator (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_unsupported_tree (pp, t);
+}
+
+static inline void
+pp_c_declarator (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_unsupported_tree (pp, t);
+}
+
+static inline void
+pp_c_init_declarator (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_declarator (pp, t);
+  if (DECL_INITIAL (t))
+    {
+      pp_whitespace (pp);
+      pp_equal (pp);
+      pp_whitespace (pp);
+      pp_c_initializer (pp, DECL_INITIAL (t));
+    }
+}
+
+void
+pp_c_declaration (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_declaration_specifiers (pp, t);
+  pp_c_init_declarator (pp, t);
+}
+
+static void
+pp_c_parameter_declaration (pp, t)
+     c_pretty_printer pp;
+     tree t;
+{
+  pp_unsupported_tree (pp, t);
+}
+
 \f
 /* Expressions.  */
 
 /* Print out a c-char.  */
 static void
 pp_c_char (ppi, c)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      int c;
 {
   switch (c)
@@ -234,7 +312,7 @@ pp_c_char (ppi, c)
 /* Print out a STRING literal.  */
 static inline void
 pp_c_string_literal (ppi, s)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree s;
 {
   const char *p = TREE_STRING_POINTER (s);
@@ -249,7 +327,7 @@ pp_c_string_literal (ppi, s)
 /* Print out a CHARACTER literal.  */
 static inline void
 pp_c_character_literal (ppi, c)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree c;
 {
   pp_quote (ppi);
@@ -260,7 +338,7 @@ pp_c_character_literal (ppi, c)
 /* Print out a BOOLEAN literal.  */
 static inline void
 pp_c_bool_literal (ppi, b)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree b;
 {
   if (b == boolean_false_node || integer_zerop (b))
@@ -291,7 +369,7 @@ pp_c_bool_literal (ppi, b)
    is then printed by pp_c_integer_literal.  */
 static bool
 pp_c_enumerator (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   tree type = TREE_TYPE (e);
@@ -320,7 +398,7 @@ pp_c_enumerator (ppi, e)
 /* Print out an INTEGER constant value.  */
 static void
 pp_c_integer_literal (ppi, i)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree i;
 {
   tree type = TREE_TYPE (i);
@@ -359,7 +437,7 @@ pp_c_integer_literal (ppi, i)
 /* Print out a REAL value. */
 static inline void
 pp_c_real_literal (ppi, r)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree r;
 {
   REAL_VALUE_TO_DECIMAL (TREE_REAL_CST (r), "%.16g",
@@ -370,7 +448,7 @@ pp_c_real_literal (ppi, r)
 
 void
 pp_c_literal (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   switch (TREE_CODE (e))
@@ -396,7 +474,7 @@ pp_c_literal (ppi, e)
 /* Pretty-print a C primary-expression.  */
 static void
 pp_c_primary_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   switch (TREE_CODE (e))
@@ -461,7 +539,7 @@ pp_c_primary_expression (ppi, e)
 /* Print out a C initializer -- also support C compound-literals.  */
 void
 pp_c_initializer (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == CONSTRUCTOR)
@@ -482,7 +560,7 @@ pp_c_initializer (ppi, e)
 
 static void
 pp_c_initializer_list (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   tree type = TREE_TYPE (e);
@@ -519,7 +597,7 @@ pp_c_initializer_list (ppi, e)
 
 void
 pp_c_postfix_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -651,7 +729,7 @@ pp_c_postfix_expression (ppi, e)
 /* Print out an expression-list; E is expected to be a TREE_LIST  */
 void
 pp_c_expression_list (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   for (; e != NULL_TREE; e = TREE_CHAIN (e))
@@ -664,7 +742,7 @@ pp_c_expression_list (ppi, e)
 
 static void
 pp_c_unary_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -725,7 +803,7 @@ pp_c_unary_expression (ppi, e)
 
 void
 pp_c_cast_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == CONVERT_EXPR || TREE_CODE (e) == FLOAT_EXPR)
@@ -741,7 +819,7 @@ pp_c_cast_expression (ppi, e)
 
 static void
 pp_c_multiplicative_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -770,7 +848,7 @@ pp_c_multiplicative_expression (ppi, e)
 
 static inline void
 pp_c_additive_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -796,7 +874,7 @@ pp_c_additive_expression (ppi, e)
 
 static inline void
 pp_c_shift_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -818,7 +896,7 @@ pp_c_shift_expression (ppi, e)
 
 static void
 pp_c_relational_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -850,7 +928,7 @@ pp_c_relational_expression (ppi, e)
 
 static inline void
 pp_c_equality_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   enum tree_code code = TREE_CODE (e);
@@ -873,7 +951,7 @@ pp_c_equality_expression (ppi, e)
 
 static inline void
 pp_c_and_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == BIT_AND_EXPR)
@@ -890,7 +968,7 @@ pp_c_and_expression (ppi, e)
 
 static inline void
 pp_c_exclusive_or_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == BIT_XOR_EXPR)
@@ -907,7 +985,7 @@ pp_c_exclusive_or_expression (ppi, e)
 
 static inline void
 pp_c_inclusive_or_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == BIT_IOR_EXPR)
@@ -924,7 +1002,7 @@ pp_c_inclusive_or_expression (ppi, e)
 
 static inline void
 pp_c_logical_and_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == TRUTH_ANDIF_EXPR)
@@ -941,7 +1019,7 @@ pp_c_logical_and_expression (ppi, e)
 
 void
 pp_c_logical_or_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == TRUTH_ORIF_EXPR)
@@ -958,7 +1036,7 @@ pp_c_logical_or_expression (ppi, e)
 
 static void
 pp_c_conditional_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == COND_EXPR)
@@ -981,7 +1059,7 @@ pp_c_conditional_expression (ppi, e)
 /* Pretty-print a C assignment-expression.  */
 static void
 pp_c_assignment_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   if (TREE_CODE (e) == MODIFY_EXPR || TREE_CODE (e) == INIT_EXPR)
@@ -999,7 +1077,7 @@ pp_c_assignment_expression (ppi, e)
 /* Pretty-print an expression.  */
 void
 pp_c_expression (ppi, e)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree e;
 {
   switch (TREE_CODE (e))
@@ -1136,7 +1214,7 @@ pp_c_expression (ppi, e)
 /* Statements.  */
 void
 pp_c_statement (ppi, stmt)
-     c_pretty_print_info *ppi;
+     c_pretty_printer ppi;
      tree stmt;
 {
   const enum tree_code code = TREE_CODE (stmt);
@@ -1358,3 +1436,29 @@ pp_c_statement (ppi, stmt)
 
 }
 
+\f
+/* Initialize the PRETTY-PRINTER for handling C codes.  */
+void
+pp_c_pretty_printer_init (pp)
+     c_pretty_printer pp;
+{
+  pp->offset_list               = 0;
+
+  pp->declaration               = pp_c_declaration;
+  pp->declaration_specifiers    = pp_c_declaration_specifiers;
+  pp->type_specifier            = pp_c_simple_type_specifier;
+  pp->declarator                = pp_c_declarator;
+  pp->direct_declarator         = pp_c_direct_declarator;
+  pp->parameter_declaration     = pp_c_parameter_declaration;
+  pp->type_id                   = pp_c_type_id;
+
+  pp->statement                 = pp_c_statement;
+
+  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;
+}

diff --git a/gcc/c-pretty-print.h b/gcc/c-pretty-print.h
index 13bd432..a391dcc 100644 (file)
--- a/gcc/c-pretty-print.h
+++ b/gcc/c-pretty-print.h
@@ -26,10 +26,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* The data type used to bundle information necessary for pretty-printing
    a C or C++ entity.  */
-typedef struct c_pretty_print_info c_pretty_print_info;
+typedef struct c_pretty_print_info *c_pretty_printer;
 
 /* The type of a C pretty-printer 'member' function.  */
-typedef void (*c_pretty_print_fn) PARAMS ((c_pretty_print_info *, tree));
+typedef void (*c_pretty_print_fn) PARAMS ((c_pretty_printer, tree));
 
 struct c_pretty_print_info
 {
@@ -59,7 +59,6 @@ struct c_pretty_print_info
   c_pretty_print_fn assignment_expression;
 };
 
-#define pp_buffer(PPI) (PPI)->base.buffer
 #define pp_c_left_paren(PPI)             \
    do {                                  \
      pp_left_paren (PPI);                \
@@ -100,6 +99,7 @@ struct c_pretty_print_info
 #define pp_c_tree_identifier(PPI, ID)    \
    pp_c_identifier (PPI, IDENTIFIER_POINTER (ID))
 
+#define pp_buffer(PPI) (PPI)->base.buffer
 
 #define pp_declaration(PPI, T)            (*(PPI)->declaration) (PPI, T)
 #define pp_declaration_specifiers(PPI, D) \
@@ -125,19 +125,21 @@ struct c_pretty_print_info
    (*(PPI)->assignment_expression) (PPI, E)
 
 
+extern void pp_c_pretty_printer_init   PARAMS ((c_pretty_printer));
+
 /* Declarations.  */
-void pp_c_cv_qualifier PARAMS ((c_pretty_print_info *, int));
-void pp_c_parameter_declaration_clause PARAMS ((c_pretty_print_info *, tree));
-void pp_c_declaration PARAMS ((c_pretty_print_info *, tree));
-void pp_c_statement PARAMS ((c_pretty_print_info *, tree));
-void pp_c_expression PARAMS ((c_pretty_print_info *, tree));
+void pp_c_cv_qualifier                 PARAMS ((c_pretty_printer, int));
+void pp_c_parameter_declaration_clause PARAMS ((c_pretty_printer, tree));
+void pp_c_declaration                  PARAMS ((c_pretty_printer, tree));
+void pp_c_statement                    PARAMS ((c_pretty_printer, tree));
+void pp_c_expression                   PARAMS ((c_pretty_printer, tree));
 /* Statements.  */
-void pp_c_statement PARAMS ((c_pretty_print_info *, tree));
+void pp_c_statement                    PARAMS ((c_pretty_printer, tree));
 /* Expressions.  */
-void pp_c_expression PARAMS ((c_pretty_print_info *, tree));
-void pp_c_logical_or_expression PARAMS ((c_pretty_print_info *, tree));
-void pp_c_expression_list PARAMS ((c_pretty_print_info *, tree));
-void pp_c_cast_expression PARAMS ((c_pretty_print_info *, tree));
-void pp_c_postfix_expression PARAMS ((c_pretty_print_info *, tree));
-void pp_c_initializer PARAMS ((c_pretty_print_info *, tree));
-void pp_c_literal PARAMS ((c_pretty_print_info *, tree));
+void pp_c_expression                   PARAMS ((c_pretty_printer, tree));
+void pp_c_logical_or_expression        PARAMS ((c_pretty_printer, tree));
+void pp_c_expression_list              PARAMS ((c_pretty_printer, tree));
+void pp_c_cast_expression              PARAMS ((c_pretty_printer, tree));
+void pp_c_postfix_expression           PARAMS ((c_pretty_printer, tree));
+void pp_c_initializer                  PARAMS ((c_pretty_printer, tree));
+void pp_c_literal                      PARAMS ((c_pretty_printer, tree));