C++: clean up cp_printer

This makes it easier to compare cp_printer with gcc_cxxdiag_char_table
in c-format.c.

No functional change intended.

gcc/cp/ChangeLog:
	* error.c (cp_printer): In the leading comment, move "%H" and "%I"
	into alphabetical order, and add missing "%G" and "%K".  Within
	the switch statement, move cases 'G', 'H', 'I' and 'K' so that the
	cases are in alphabetical order.

From-SVN: r263046

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4edb661a384f1b60d3a624d3ec02663c43dd04aa..d3b3cc2be6c26d963f3de8598d334ef78630952f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-28  David Malcolm  <dmalcolm@redhat.com>
+
+       * error.c (cp_printer): In the leading comment, move "%H" and "%I"
+       into alphabetical order, and add missing "%G" and "%K".  Within
+       the switch statement, move cases 'G', 'H', 'I' and 'K' so that the
+       cases are in alphabetical order.
+
 2018-07-25  Jakub Jelinek  <jakub@redhat.com>
 
        * cp-tree.h (enum cp_tree_index): Add

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index b0d8e322e6507e17f24f350b52a67e58a4072b60..7a644fdca6f3c736f49a2a696c90773e3da943df 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -4025,6 +4025,10 @@ defer_phase_2_of_type_diff (deferred_printed_type *deferred,
    %D   declaration.
    %E   expression.
    %F   function declaration.
+   %G   gcall *
+   %H   type difference (from).
+   %I   type difference (to).
+   %K   tree
    %L  language as used in extern "lang".
    %O  binary operator.
    %P   function parameter whose position is indicated by an integer.
@@ -4032,9 +4036,7 @@ defer_phase_2_of_type_diff (deferred_printed_type *deferred,
    %S   substitution (template + args)
    %T   type.
    %V   cv-qualifier.
-   %X   exception-specification.
-   %H   type difference (from)
-   %I   type difference (to).  */
+   %X   exception-specification.  */
 static bool
 cp_printer (pretty_printer *pp, text_info *text, const char *spec,
            int precision, bool wide, bool set_locus, bool verbose,
@@ -4076,6 +4078,21 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
       break;
     case 'E': result = expr_to_string (next_tree);             break;
     case 'F': result = fndecl_to_string (next_tree, verbose);  break;
+    case 'G':
+      percent_G_format (text);
+      return true;
+    case 'H':
+      defer_phase_2_of_type_diff (&postprocessor->m_type_a, next_tree,
+                                 buffer_ptr, verbose, *quoted);
+      return true;
+    case 'I':
+      defer_phase_2_of_type_diff (&postprocessor->m_type_b, next_tree,
+                                 buffer_ptr, verbose, *quoted);
+      return true;
+    case 'K':
+      t = va_arg (*text->args_ptr, tree);
+      percent_K_format (text, t);
+      return true;
     case 'L': result = language_to_string (next_lang);         break;
     case 'O': result = op_to_string (false, next_tcode);       break;
     case 'P': result = parm_to_string (next_int);              break;
@@ -4090,29 +4107,6 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
     case 'V': result = cv_to_string (next_tree, verbose);      break;
     case 'X': result = eh_spec_to_string (next_tree, verbose);  break;
 
-    case 'G':
-      percent_G_format (text);
-      return true;
-
-    case 'K':
-      t = va_arg (*text->args_ptr, tree);
-      percent_K_format (text, t);
-      return true;
-
-    case 'H':
-      {
-       defer_phase_2_of_type_diff (&postprocessor->m_type_a, next_tree,
-                                   buffer_ptr, verbose, *quoted);
-       return true;
-      }
-
-    case 'I':
-      {
-       defer_phase_2_of_type_diff (&postprocessor->m_type_b, next_tree,
-                                   buffer_ptr, verbose, *quoted);
-       return true;
-      }
-
     default:
       return false;
     }