re PR c++/30863 (Unsigned templatized struct treated as unsigned int)

	PR c++/30863
	* parser.c (cp_parser_parse_and_diagnose_invalid_type_name): Do
	not consume tokens when failing.
	PR c++/30863
	* g++.dg/template/error24.C: New test.
	* g++.dg/parse/tmpl-outside1.C: Tweak error markers.

From-SVN: r123152

gcc/cp/ChangeLog

+2007-03-22  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/30863
+	* parser.c (cp_parser_parse_and_diagnose_invalid_type_name): Do
+	not consume tokens when failing.
+
 2007-03-22  Jim Wilson  <wilson@specifix.com>
 	    Mark Mitchell  <mark@codesourcery.com>
 

gcc/cp/parser.c

@@ -2343,12 +2343,13 @@ cp_parser_parse_and_diagnose_invalid_type_name (cp_parser *parser)
      the scope is dependent, we cannot do much.  */
   if (!cp_lexer_next_token_is (parser->lexer, CPP_NAME)
       || (parser->scope && TYPE_P (parser->scope)
-	  && dependent_type_p (parser->scope)))
+	  && dependent_type_p (parser->scope))
+      || TREE_CODE (id) == TYPE_DECL)
     {
       cp_parser_abort_tentative_parse (parser);
       return false;
     }
-  if (!cp_parser_parse_definitely (parser) || TREE_CODE (id) == TYPE_DECL)
+  if (!cp_parser_parse_definitely (parser))
     return false;
 
   /* Emit a diagnostic for the invalid type.  */

gcc/testsuite/ChangeLog

 2007-03-22  Mark Mitchell  <mark@codesourcery.com>
 
+	PR c++/30863
+	* g++.dg/template/error24.C: New test.
+	* g++.dg/parse/tmpl-outside1.C: Tweak error markers.
+
+2007-03-22  Mark Mitchell  <mark@codesourcery.com>
+
 	PR c++/31273
 	* g++.dg/expr/bitfield7.C: New test.
 

gcc/testsuite/g++.dg/parse/tmpl-outside1.C

@@ -7,5 +7,4 @@ struct X
    template <int i> struct Y {};
 };
 
-typedef X::template Y<0> y; // { dg-error "template" }
-// { dg-bogus "with no type" "" { xfail *-*-* } 10 }
+typedef X::template Y<0> y; // { dg-error "template|invalid" }

gcc/testsuite/g++.dg/template/error24.C

+// PR c++/30863
+
+template <typename T>
+struct s {};
+
+void f() {
+  unsigned s<int> x; // { dg-error "invalid" }
+}