procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Mark Mitchell 2007-03-23 04:37:40 +00:00 • committed by Mark Mitchell
parent 725d6b877d
commit 8b84995aa3
5 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
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>

5
gcc/cp/parser.c
View file

@ -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. */

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
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

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

@ -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" }

8
gcc/testsuite/g++.dg/template/error24.C Normal file
View file

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