]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR c++/39639 (no diagnostic for ill-formed pack expansion)
authorDodji Seketeli <dodji@redhat.com>
Wed, 22 Apr 2009 19:13:40 +0000 (19:13 +0000)
committerDodji Seketeli <dodji@gcc.gnu.org>
Wed, 22 Apr 2009 19:13:40 +0000 (21:13 +0200)
2009-04-22  Dodji Seketeli  <dodji@redhat.com>

    gcc/cp/ChangeLog:
     PR c++/39639
     * parser.c (cp_parser_template_argument_list): Display an error
     when an ellipsis is not preceded by a parameter pack. Also, warn
     about variadic templates usage without -std=c++0x.

    gcc/testsuite/ChangeLog:
     PR c++/39639
     * g++.dg/cpp0x/pr39639.C: New test.

From-SVN: r146608

gcc/cp/ChangeLog
gcc/cp/parser.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/cpp0x/pr39639.C [new file with mode: 0644]

index d363604a6d21a3c6af29e395b84ccb6fc9837382..7e5eb2d78cb01d4a5869dc6c18f7097d69bdab00 100644 (file)
@@ -1,3 +1,10 @@
+2009-04-22  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/39639
+       * parser.c (cp_parser_template_argument_list): Display an error
+       when an ellipsis is not preceded by a parameter pack. Also, warn
+       about variadic templates usage without -std=c++0x.
+
 2009-04-13  Jason Merrill  <jason@redhat.com>
 
        PR c++/39480
index ec3130ab9c12c71b0e90daebeeb09436ae59a142..80b19493977234152e1a59f785af38247cdf27ab 100644 (file)
@@ -10095,6 +10095,12 @@ cp_parser_template_argument_list (cp_parser* parser)
          argument pack. */
       if (cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))
         {
+         if (argument == error_mark_node)
+           {
+             cp_token *token = cp_lexer_peek_token (parser->lexer);
+             error ("%Hexpected parameter pack before %<...%>",
+                    &token->location);
+           }
           /* Consume the `...' token. */
           cp_lexer_consume_token (parser->lexer);
 
index 512d3e7f819bcfafa04d500e48503e1f5b2a072c..a9b3c604fc33303f034076f7776c1a55066fc8e8 100644 (file)
@@ -1,3 +1,8 @@
+2009-04-22  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/39639
+       * g++.dg/cpp0x/pr39639.C: New test.
+
 2009-04-22  Richard Guenther  <rguenther@suse.de>
 
        Backport from mainline:
diff --git a/gcc/testsuite/g++.dg/cpp0x/pr39639.C b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
new file mode 100644 (file)
index 0000000..abd3bcf
--- /dev/null
@@ -0,0 +1,20 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin: PR c++/39639
+// { dg-options "-std=c++0x" }
+// { dg-do "compile" }
+
+template <class... Types>
+struct S
+  : S<...Types>, // { dg-error "expected parameter pack before '...'" }
+    S<...Types...>, // { dg-error "expected parameter pack before '...'" }
+    S<...> // { dg-error "expected parameter pack before '...'" }
+{
+  static int f () { return 1;}
+};
+
+int
+main ()
+{
+  return S<void>::f ();
+}
+