[Bug c++/94571] Error: Expected comma or semicolon, comma found

["jakub at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94571

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jakub at gcc dot gnu.org

--- Comment #3 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
It is a pasto, either we can go with the simple:
2020-04-14  Jakub Jelinek  <jakub@redhat.com>

        PR c++/94571
        * parser.c (cp_parser_simple_declaration): Fix up a pasto in
        diagnostics.

        * g++.dg/cpp1z/decomp51.C: New test.

--- gcc/cp/parser.c.jj  2020-04-08 11:59:23.772460767 +0200
+++ gcc/cp/parser.c     2020-04-14 10:15:54.824034781 +0200
@@ -13675,7 +13675,7 @@ cp_parser_simple_declaration (cp_parser*
            if ((decl != error_mark_node
                 && DECL_INITIAL (decl) != error_mark_node)
                || cp_parser_uncommitted_to_tentative_parse_p (parser))
-             cp_parser_error (parser, "expected %<,%> or %<;%>");
+             cp_parser_error (parser, "expected %<;%>");
            /* Skip tokens until we reach the end of the statement.  */
            cp_parser_skip_to_end_of_statement (parser);
            /* If the next token is now a `;', consume it.  */
--- gcc/testsuite/g++.dg/cpp1z/decomp51.C.jj    2020-04-14 10:18:58.318313777
+0200
+++ gcc/testsuite/g++.dg/cpp1z/decomp51.C       2020-04-14 10:19:31.347823985
+0200
@@ -0,0 +1,16 @@
+// PR c++/94571
+// { dg-do compile { target c++17 } }
+
+void
+foo ()
+{
+  int e[2], f[2];
+  auto [a,b] = e, [c,d] = f;   // { dg-error "expected ';' before ',' token" }
+}
+
+void
+bar ()
+{
+  int e[2];
+  auto [a, b] = e );           // { dg-error "expected ';' before '\\\)'
token" }
+}

change or can have a separate diagnostics for when there is a comma (but still
want the diagnostic about only ; expected when there is random garbage after
the expression).