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

error.c (dump_expr): Handle dependent names that designate types.

Browse Source 
* error.c (dump_expr): Handle dependent names that designate types.
	* cxx-pretty-print.c (pp_cxx_unqualified_id): Handle TYPENAME_TYPE.

From-SVN: r123148
This commit is contained in:
Gabriel Dos Reis 2007-03-23 02:58:46 +00:00 committed by Gabriel Dos Reis
parent ecee68026b
commit 5a023baa1f
4 changed files with 39 additions and 10 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 @@
2007-03-22 Gabriel Dos Reis <gdr@integrable-solutions.net>
* error.c (dump_expr): Handle dependent names that designate types.
* cxx-pretty-print.c (pp_cxx_unqualified_id): Handle TYPENAME_TYPE.
2007-03-17 Kazu Hirata <kazu@codesourcery.com> 2007-03-17 Kazu Hirata <kazu@codesourcery.com>
* cp-tree.def, parser.c, pt.c: Fix comment typos. * cp-tree.def, parser.c, pt.c: Fix comment typos.

8
gcc/cp/cxx-pretty-print.c
View File

@ -129,7 +129,9 @@ pp_cxx_template_id (cxx_pretty_printer *pp, tree t)
pp_cxx_end_template_argument_list (pp); pp_cxx_end_template_argument_list (pp);
} }
/* unqualified-id: /* Prints the unqualified part of the id-expression T.
unqualified-id:
identifier identifier
operator-function-id operator-function-id
conversion-function-id conversion-function-id
@ -204,6 +206,10 @@ pp_cxx_unqualified_id (cxx_pretty_printer *pp, tree t)
pp_cxx_unqualified_id (pp, TEMPLATE_PARM_DECL (t)); pp_cxx_unqualified_id (pp, TEMPLATE_PARM_DECL (t));
break; break;
case TYPENAME_TYPE:
pp_cxx_unqualified_id (pp, TYPE_NAME (t));
break;
default: default:
pp_unsupported_tree (pp, t); pp_unsupported_tree (pp, t);
break; break;

18
gcc/cp/error.c
View File

@ -1987,6 +1987,24 @@ dump_expr (tree t, int flags)
pp_cxx_identifier (cxx_pp, "..."); pp_cxx_identifier (cxx_pp, "...");
break; break;
case RECORD_TYPE:
case UNION_TYPE:
case ENUMERAL_TYPE:
case REAL_TYPE:
case VOID_TYPE:
case BOOLEAN_TYPE:
case INTEGER_TYPE:
case COMPLEX_TYPE:
case VECTOR_TYPE:
pp_type_specifier_seq (cxx_pp, t);
break;
case TYPENAME_TYPE:
/* We get here when we want to print a dependent type as an
id-expression, without any disambiguator decoration. */
pp_id_expression (cxx_pp, t);
break;
/* This list is incomplete, but should suffice for now. /* This list is incomplete, but should suffice for now.
It is very important that `sorry' does not call It is very important that `sorry' does not call
`report_error_function'. That could cause an infinite loop. */ `report_error_function'. That could cause an infinite loop. */

18
gcc/cp/parser.c
View File

@ -2054,26 +2054,26 @@ cp_parser_name_lookup_error (cp_parser* parser,
if (decl == error_mark_node) if (decl == error_mark_node)
{ {
if (parser->scope && parser->scope != global_namespace) if (parser->scope && parser->scope != global_namespace)
error ("%<%D::%D%> has not been declared", error ("%<%E::%E%> has not been declared",
parser->scope, name); parser->scope, name);
else if (parser->scope == global_namespace) else if (parser->scope == global_namespace)
error ("%<::%D%> has not been declared", name); error ("%<::%E%> has not been declared", name);
else if (parser->object_scope else if (parser->object_scope
&& !CLASS_TYPE_P (parser->object_scope)) && !CLASS_TYPE_P (parser->object_scope))
error ("request for member %qD in non-class type %qT", error ("request for member %qE in non-class type %qT",
name, parser->object_scope); name, parser->object_scope);
else if (parser->object_scope) else if (parser->object_scope)
error ("%<%T::%D%> has not been declared", error ("%<%T::%E%> has not been declared",
parser->object_scope, name); parser->object_scope, name);
else else
error ("%qD has not been declared", name); error ("%qE has not been declared", name);
} }
else if (parser->scope && parser->scope != global_namespace) else if (parser->scope && parser->scope != global_namespace)
error ("%<%D::%D%> %s", parser->scope, name, desired); error ("%<%E::%E%> %s", parser->scope, name, desired);
else if (parser->scope == global_namespace) else if (parser->scope == global_namespace)
error ("%<::%D%> %s", name, desired); error ("%<::%E%> %s", name, desired);
else else
error ("%qD %s", name, desired); error ("%qE %s", name, desired);
} }
/* If we are parsing tentatively, remember that an error has occurred /* If we are parsing tentatively, remember that an error has occurred
@ -12176,7 +12176,7 @@ cp_parser_direct_declarator (cp_parser* parser,
/*only_current_p=*/false); /*only_current_p=*/false);
/* If that failed, the declarator is invalid. */ /* If that failed, the declarator is invalid. */
if (type == error_mark_node) if (type == error_mark_node)
error ("%<%T::%D%> is not a type", error ("%<%T::%E%> is not a type",
TYPE_CONTEXT (qualifying_scope), TYPE_CONTEXT (qualifying_scope),
TYPE_IDENTIFIER (qualifying_scope)); TYPE_IDENTIFIER (qualifying_scope));
qualifying_scope = type; qualifying_scope = type;