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

re PR c++/37875 ([c++0x] misinterpreted closing angle bracket in decltype operand)

Browse source 
PR c++/37875
	* parser.c (cp_parser_decltype): Set greater_than_is_operator_p.

From-SVN: r152686
This commit is contained in:
Jason Merrill 2009-10-12 17:04:35 -04:00 • committed by Jason Merrill
parent 23f392e019
commit 478a716ab7
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2009-10-12 Jason Merrill <jason@redhat.com>
PR c++/37875
* parser.c (cp_parser_decltype): Set greater_than_is_operator_p.
PR c++/37766
* pt.c (type_unification_real): Call convert_template_argument
for function default template arguments.

13
gcc/cp/parser.c
View file

@ -9541,12 +9541,25 @@ cp_parser_decltype (cp_parser *parser)
cp_parser_parse_definitely (parser);
else
{
bool saved_greater_than_is_operator_p;
/* Abort our attempt to parse an id-expression or member access
expression. */
cp_parser_abort_tentative_parse (parser);
/* Within a parenthesized expression, a `>' token is always
the greater-than operator. */
saved_greater_than_is_operator_p
= parser->greater_than_is_operator_p;
parser->greater_than_is_operator_p = true;
/* Parse a full expression. */
expr = cp_parser_expression (parser, /*cast_p=*/false, NULL);
/* The `>' token might be the end of a template-id or
template-parameter-list now. */
parser->greater_than_is_operator_p
= saved_greater_than_is_operator_p;
}
/* Go back to evaluating expressions. */

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2009-10-12 Jason Merrill <jason@redhat.com>
PR c++/37875
* g++.dg/cpp0x/decltype18.C: New.
PR c++/37766
* g++.dg/cpp0x/fntmpdefarg1.C: New.

5
gcc/testsuite/g++.dg/cpp0x/decltype18.C Normal file
View file

@ -0,0 +1,5 @@
// PR c++/37875
// { dg-options "-std=c++0x" }
template <typename> struct X {};
X<decltype(1 > 2)> x;