* error.c (cp_tree_printer): Rework.

From-SVN: r35981

gcc/cp/ChangeLog

+2000-08-25  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+	* error.c (cp_tree_printer): Rework.
+
 2000-08-25  Mark Mitchell  <mark@codesourcery.com>
 
 	* Make-lang.in (CXX_LIB2FUNCS): Remove cp-demangle.o and

gcc/cp/error.c

@@ -2651,44 +2651,51 @@ cp_tree_printer (buffer)
       ++output_buffer_text_cursor (buffer);
     }
 
-  if (*output_buffer_text_cursor (buffer) == 'P')
-      print_function_parameter
-        (buffer, va_arg (output_buffer_format_args (buffer), int));
-  else
-    {
-      tree_being_formatted (&tfi) =
-        va_arg (output_buffer_format_args (buffer), tree);
-
   switch (*output_buffer_text_cursor (buffer))
     {
     case 'A':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_function_argument_list (buffer, &tfi);
       break;
       
     case 'D':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_declaration (buffer, &tfi);
       break;
       
     case 'E':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_expression (buffer, &tfi);
       break;
       
     case 'F':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_function_declaration (buffer, &tfi);
       break;
       
+    case 'P':
+      print_function_parameter
+        (buffer, va_arg (output_buffer_format_args (buffer), int));
+      
     case 'T':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_type (buffer, &tfi);
       break;
       
     case 'V':
+      tree_being_formatted (&tfi) =
+        va_arg (output_buffer_format_args (buffer), tree);
       print_cv_qualifier (buffer, &tfi);
       break;
       
     default:
       return 0;
     }
-    }
   
   return 1;
 }