Re: [C++ PATCH] Fix pretty-print of enumerator ids (PR c++/87364)

[Christophe Lyon]

On Fri, 12 Oct 2018 at 07:47, Christophe Lyon
<christophe.l...@linaro.org> wrote:
>
> On Fri, 12 Oct 2018 at 05:37, Jeff Law <l...@redhat.com> wrote:
> >
> > On 10/8/18 11:12 AM, will wray wrote:
> > > Hi,
> > >
> > > A PR to fix Bug 87364 - Pretty print of enumerator never prints the id,
> > > always falls back to C-style cast output
> > >
> > > The fix is tested with the code attached to the bug report and additional
> > > usage over the past few weeks.
> > >
> > > Bootstrap and regtested on x86_64-linux. OK for trunk?
> > >
> > >
> > > 2018-10-08  Will Wray  <wjw...@gmail.com>
> > >
> > > PR c++/87364
> > > * c-pretty-print.c (pp_c_enumeration_constant): fix comparison.
> > > * cxx-pretty-print.c (pp_cxx_enumeration_constant): New; add
> > > nested-specifiers prefix to enum id plus enum type for scoped enum.
> > THanks.  I fixed up some whitespace issues and the ChangeLog entry
> > before committing to the trunk.
> >
> > Also note for any future contributions, it looks like your mailer is
> > messing up tabs and wrapping lines. That makes applying the patch more
> > difficult than it should be.
> >
>
> Hi,
>
> This commit broke the GCC builds:
> /tmp/3768585_6.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/c-family/c-pretty-print.c:
> In member function 'virtual void c_pretty_printer::constant(tree)':
> /tmp/3768585_6.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/c-family/c-pretty-print.c:1141:39:
> error: expected ';' before ')' token
>     pp_c_enumeration_constant (this, e))
>                                        ^
> make[2]: *** [c-family/c-pretty-print.o] Error 1
>

I fixed the build with the obvious r265078:

2018-10-12  Christophe Lyon  <christophe.l...@linaro.org>

       PR c++/87364
       * c-pretty-print.c (c_pretty_printer::constant): Fix typo.

Index: gcc/c-family/c-pretty-print.c
===================================================================
--- gcc/c-family/c-pretty-print.c       (revision 265077)
+++ gcc/c-family/c-pretty-print.c       (revision 265078)
@@ -1138,7 +1138,7 @@
        else if (type == char_type_node)
          pp_c_character_constant (this, e);
        else if (TREE_CODE (type) == ENUMERAL_TYPE)
-         pp_c_enumeration_constant (this, e))
+         pp_c_enumeration_constant (this, e);
        else
          pp_c_integer_constant (this, e);
       }