From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27692 invoked by alias); 27 Jul 2018 21:47:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 27585 invoked by uid 89); 27 Jul 2018 21:47:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=text_info, sk:languag X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 27 Jul 2018 21:47:48 +0000 Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99E80308FB8C for ; Fri, 27 Jul 2018 21:47:46 +0000 (UTC) Received: from c64.redhat.com (ovpn-112-35.phx2.redhat.com [10.3.112.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD143CBD75; Fri, 27 Jul 2018 21:47:45 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 3/5] C++: clean up cp_printer Date: Fri, 27 Jul 2018 21:47:00 -0000 Message-Id: <1532730752-10525-4-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1532730752-10525-1-git-send-email-dmalcolm@redhat.com> References: <1532730752-10525-1-git-send-email-dmalcolm@redhat.com> X-IsSubscribed: yes X-SW-Source: 2018-07/txt/msg01766.txt.bz2 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. --- gcc/cp/error.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/gcc/cp/error.c b/gcc/cp/error.c index b0d8e32..7a644fd 100644 --- 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; } -- 1.8.5.3