* c-pretty-print.c (pp_c_left_bracket): Make a function.

        (pp_c_right_bracket): Likewise.
        (pp_c_star): Likewise.
        (pp_c_ampersand): Define.
        * c-pretty-print.h (pp_c_left_bracket): Declare.
        (pp_c_right_bracket): Likewise.
        (pp_c_star): Likewise.
        (pp_c_ampersand): Likewise.

cp/
        * cxx-pretty-print.c (pp_cxx_colon_colon): Expor.
        (pp_cxx_begin_template_argument_list): Turn into a function.
        (pp_cxx_end_template_argument_list): Likewise.
        (pp_cxx_separate_with): Define.
        (pp_cxx_unqualified_id): Tidy.
        (pp_cxx_primary_expression): Likewise.
        (pp_cxx_postfix_expression): Likewise.
        (pp_cxx_expression): Likewise.
        (pp_cxx_simple_type_specifier): Likewise.
        (pp_cxx_type_specifier_seq): Likewise.
        (pp_cxx_parameter_declaration_clause): Likewise.
        (pp_cxx_exception_specification): Likewise.
        (pp_cxx_direct_declarator): Likewise.
        (pp_cxx_type_id): Likewise.
        * cxx-pretty-print.h (pp_cxx_whitespace): Export from
        cxx-pretty-print.c.
        (pp_cxx_left_paren): Likewise.
        (pp_cxx_right_paren): Likewise.
        (pp_cxx_left_brace): Likewise.
        (pp_cxx_right_brace): Likewise.
        (pp_cxx_left_bracket): Likewise.
        (pp_cxx_right_bracket): Likewise.
        (pp_cxx_dot): Likewise.
        (pp_cxx_identifier): Likewise.
        (pp_cxx_tree_identifier): Likewise.
        (pp_cxx_ampersand): New macro.
        (pp_cxx_star): Likewise.
        (pp_cxx_arrow): Likewise.
        (pp_cxx_semicolon): Likewise.
        (pp_cxx_complement): Likewise.
        (pp_cxx_begin_template_argument_list): Declaree.
        (pp_cxx_end_template_argument_list): Likewise.
        (pp_cxx_colon_colon): likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82488 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 35 insertions, 18 deletions

diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c
index e73ab1b51e3..4b5dd51e578 100644
--- a/gcc/c-pretty-print.c
+++ b/gcc/c-pretty-print.c
@@ -42,24 +42,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
        pp_c_whitespace (PP);                 \
    } while (0)
 
-#define pp_c_left_bracket(PP)         \
-  do {                                \
-    pp_left_bracket (PP);             \
-    pp_base (PP)->padding = pp_none;  \
-  } while (0)
-
-#define pp_c_right_bracket(PP)        \
-  do {                                \
-    pp_right_bracket (PP);            \
-    pp_base (PP)->padding = pp_none;  \
-  } while (0)
-
-#define pp_c_star(PP)                 \
-  do {                                \
-    pp_star (PP);                     \
-    pp_base (PP)->padding = pp_none;  \
-  } while (0)
-
 /* literal  */
 static void pp_c_char (c_pretty_printer *, int);
 
@@ -120,6 +102,20 @@ pp_c_right_brace (c_pretty_printer *pp)
 }
 
 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;
+}
+
+void
 pp_c_dot (c_pretty_printer *pp)
 {
   pp_dot (pp);
@@ -134,6 +130,13 @@ pp_c_ampersand (c_pretty_printer *pp)
 }
 
 void
+pp_c_star (c_pretty_printer *pp)
+{
+  pp_star (pp);
+  pp_base (pp)->padding = pp_none;
+}
+
+void
 pp_c_arrow (c_pretty_printer *pp)
 {
   pp_arrow (pp);
@@ -147,6 +150,20 @@ pp_c_semicolon (c_pretty_printer *pp)
   pp_base (pp)->padding = pp_none;
 }
 
+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;
+}
+
 /* Print out the external representation of CV-QUALIFIER.  */
 
 static void