OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

parser.c (cp_parser_unqualified_id): Handle __func__ here.

Browse Source 
* parser.c (cp_parser_unqualified_id): Handle __func__ here.
	(cp_parser_primary_expression): Not here.

From-SVN: r217241
This commit is contained in:
Jason Merrill 2014-11-07 18:01:09 -05:00 committed by Jason Merrill
parent 15babd13d6
commit 04af98c61b
4 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-07 Jason Merrill <jason@redhat.com>
* parser.c (cp_parser_unqualified_id): Handle __func__ here.
(cp_parser_primary_expression): Not here.
2014-11-07 Thomas Preud'homme <thomas.preudhomme@arm.com>
PR c++/63366

52
gcc/cp/parser.c
View File

@ -4502,39 +4502,9 @@ cp_parser_primary_expression (cp_parser *parser,
case RID_FUNCTION_NAME:
case RID_PRETTY_FUNCTION_NAME:
case RID_C99_FUNCTION_NAME:
{
non_integral_constant name;
/* The symbols __FUNCTION__, __PRETTY_FUNCTION__, and
__func__ are the names of variables -- but they are
treated specially. Therefore, they are handled here,
rather than relying on the generic id-expression logic
below. Grammatically, these names are id-expressions.
Consume the token. */
token = cp_lexer_consume_token (parser->lexer);
switch (token->keyword)
{
case RID_FUNCTION_NAME:
name = NIC_FUNC_NAME;
break;
case RID_PRETTY_FUNCTION_NAME:
name = NIC_PRETTY_FUNC;
break;
case RID_C99_FUNCTION_NAME:
name = NIC_C99_FUNC;
break;
default:
gcc_unreachable ();
}
if (cp_parser_non_integral_constant_expression (parser, name))
return error_mark_node;
/* Look up the name. */
return finish_fname (token->u.value);
}
__func__ are the names of variables. */
goto id_expression;
case RID_VA_ARG:
{
@ -4955,6 +4925,7 @@ cp_parser_unqualified_id (cp_parser* parser,
bool optional_p)
{
cp_token *token;
tree id;
/* Peek at the next token. */
token = cp_lexer_peek_token (parser->lexer);
@ -4963,8 +4934,6 @@ cp_parser_unqualified_id (cp_parser* parser,
{
case CPP_NAME:
{
tree id;
/* We don't know yet whether or not this will be a
template-id. */
cp_parser_parse_tentatively (parser);
@ -5201,10 +5170,9 @@ cp_parser_unqualified_id (cp_parser* parser,
}
case CPP_KEYWORD:
if (token->keyword == RID_OPERATOR)
switch (token->keyword)
{
tree id;
case RID_OPERATOR:
/* This could be a template-id, so we try that first. */
cp_parser_parse_tentatively (parser);
/* Try a template-id. */
@ -5234,6 +5202,16 @@ cp_parser_unqualified_id (cp_parser* parser,
}
return id;
case RID_FUNCTION_NAME:
case RID_PRETTY_FUNCTION_NAME:
case RID_C99_FUNCTION_NAME:
cp_lexer_consume_token (parser->lexer);
finish_fname (token->u.value);
return token->u.value;
default:
break;
}
/* Fall through. */

6
gcc/testsuite/g++.dg/cpp0x/decltype-func.C Normal file
View File

@ -0,0 +1,6 @@
// { dg-do compile { target c++11 } }
void f() {
typedef decltype(__func__) T;
T x = __func__; // { dg-error "array" }
}

1
gcc/testsuite/g++.dg/other/error34.C
View File

@ -4,3 +4,4 @@
S () : str(__PRETTY_FUNCTION__) {} // { dg-error "forbids declaration" "decl" }
// { dg-error "only constructors" "constructor" { target *-*-* } 5 }
// { dg-prune-output "__PRETTY_FUNCTION__" }