From 2b7a3abf6e2488a0b7e4f1bad6b1da3616d60eea Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Fri, 11 Jul 2008 12:54:22 +0000 Subject: [PATCH] re PR c++/31754 (Improve column number accuracy in error messages) 2008-07-11 Dodji Seketeli PR c++/31754 * pt.c, semantic.c: * semantic.c (qualified_name_lookup_error, finish_id_expression): add a location_t parameter so that error message can have a more accurate location. * cp-tree.h: updated prototype * pt.c (tsubst_qualified_id): use location in error messages. * parser.c (cp_parser_postfix_expression, cp_parser_objc_statement, cp_parser_trait_expr, cp_parser_token_is_class_key, cp_parser_uncommitted_to_tentative_parse_p, cp_parser_check_for_invalid_template_id, cp_parser_is_string_literal, cp_parser_error, cp_parser_name_lookup_error, cp_parser_simulate_error, cp_parser_check_decl_spec, cp_parser_check_decl_spec, cp_parser_non_integral_constant_expression, cp_parser_diagnose_invalid_type_name, cp_parser_parse_and_diagnose_invalid_type_name, cp_parser_require_pragma_eol, cp_parser_make_typename_type, cp_parser_string_literal, cp_parser_primary_expression, cp_parser_primary_expression, cp_parser_unqualified_id, cp_parser_nested_name_specifier_opt, cp_parser_postfix_expression, cp_parser_postfix_dot_deref_expression, cp_parser_new_expression, cp_parser_direct_new_declarator, cp_parser_builtin_offsetof, cp_parser_label_for_labeled_statement, cp_parser_statement_seq_opt, cp_parser_jump_statement, cp_parser_block_declaration, cp_parser_simple_declaration, cp_parser_decl_specifier_seq, cp_parser_function_specifier_opt, cp_parser_decltype, cp_parser_mem_initializer_list, cp_parser_mem_initializer, cp_parser_mem_initializer_id, cp_parser_template_parameter, cp_parser_type_parameter, cp_parser_template_id, cp_parser_template_name, cp_parser_template_argument): likewise. From-SVN: r137716 --- gcc/cp/ChangeLog | 34 + gcc/cp/cp-tree.h | 6 +- gcc/cp/parser.c | 686 ++++++++++++------ gcc/cp/pt.c | 12 +- gcc/cp/semantics.c | 24 +- gcc/testsuite/ChangeLog | 7 + gcc/testsuite/g++.dg/parse/constructor1.C | 5 +- gcc/testsuite/g++.dg/parse/error-column.C | 9 + gcc/testsuite/g++.dg/parse/error1.C | 3 +- gcc/testsuite/g++.dg/parse/error10.C | 8 +- gcc/testsuite/g++.dg/parse/error11.C | 27 +- gcc/testsuite/g++.dg/parse/error12.C | 5 +- gcc/testsuite/g++.dg/parse/error13.C | 7 +- gcc/testsuite/g++.dg/parse/error14.C | 3 +- gcc/testsuite/g++.dg/parse/error15.C | 33 +- gcc/testsuite/g++.dg/parse/error16.C | 5 +- gcc/testsuite/g++.dg/parse/error17.C | 5 +- gcc/testsuite/g++.dg/parse/error18.C | 3 +- gcc/testsuite/g++.dg/parse/error19.C | 5 +- gcc/testsuite/g++.dg/parse/error2.C | 7 +- gcc/testsuite/g++.dg/parse/error20.C | 3 +- gcc/testsuite/g++.dg/parse/error21.C | 4 +- gcc/testsuite/g++.dg/parse/error22.C | 3 +- gcc/testsuite/g++.dg/parse/error23.C | 4 +- gcc/testsuite/g++.dg/parse/error24.C | 3 +- gcc/testsuite/g++.dg/parse/error25.C | 13 +- gcc/testsuite/g++.dg/parse/error26.C | 6 +- gcc/testsuite/g++.dg/parse/error27.C | 9 +- gcc/testsuite/g++.dg/parse/error28.C | 7 +- gcc/testsuite/g++.dg/parse/error29.C | 7 +- gcc/testsuite/g++.dg/parse/error3.C | 17 +- gcc/testsuite/g++.dg/parse/error30.C | 5 +- gcc/testsuite/g++.dg/parse/error31.C | 4 +- gcc/testsuite/g++.dg/parse/error4.C | 11 +- gcc/testsuite/g++.dg/parse/error5.C | 17 +- gcc/testsuite/g++.dg/parse/error6.C | 9 +- gcc/testsuite/g++.dg/parse/error7.C | 5 +- gcc/testsuite/g++.dg/parse/error8.C | 10 +- gcc/testsuite/g++.dg/parse/error9.C | 8 +- gcc/testsuite/g++.old-deja/g++.pt/niklas01a.C | 5 +- gcc/testsuite/lib/g++.exp | 1 - 41 files changed, 697 insertions(+), 348 deletions(-) create mode 100644 gcc/testsuite/g++.dg/parse/error-column.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2143fe22808..0161f2e8c10 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,37 @@ +2008-07-11 Dodji Seketeli + + PR c++/31754 + * pt.c, semantic.c: + * semantic.c (qualified_name_lookup_error, finish_id_expression): + add a location_t parameter so that + error message can have a more accurate location. + * cp-tree.h: updated prototype + * pt.c (tsubst_qualified_id): use location in error messages. + * parser.c (cp_parser_postfix_expression, + cp_parser_objc_statement, cp_parser_trait_expr, + cp_parser_token_is_class_key, + cp_parser_uncommitted_to_tentative_parse_p, + cp_parser_check_for_invalid_template_id, cp_parser_is_string_literal, + cp_parser_error, cp_parser_name_lookup_error, + cp_parser_simulate_error, cp_parser_check_decl_spec, + cp_parser_check_decl_spec, cp_parser_non_integral_constant_expression, + cp_parser_diagnose_invalid_type_name, + cp_parser_parse_and_diagnose_invalid_type_name, + cp_parser_require_pragma_eol, cp_parser_make_typename_type, + cp_parser_string_literal, cp_parser_primary_expression, + cp_parser_primary_expression, cp_parser_unqualified_id, + cp_parser_nested_name_specifier_opt, cp_parser_postfix_expression, + cp_parser_postfix_dot_deref_expression, cp_parser_new_expression, + cp_parser_direct_new_declarator, cp_parser_builtin_offsetof, + cp_parser_label_for_labeled_statement, cp_parser_statement_seq_opt, + cp_parser_jump_statement, cp_parser_block_declaration, + cp_parser_simple_declaration, cp_parser_decl_specifier_seq, + cp_parser_function_specifier_opt, cp_parser_decltype, + cp_parser_mem_initializer_list, cp_parser_mem_initializer, + cp_parser_mem_initializer_id, cp_parser_template_parameter, + cp_parser_type_parameter, cp_parser_template_id, cp_parser_template_name, + cp_parser_template_argument): likewise. + 2008-07-09 Paolo Carlini PR c++/36760 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index ed6ae0e810a..10eba33ea3e 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4653,13 +4653,15 @@ extern void finish_template_decl (tree); extern tree finish_template_type (tree, tree, int); extern tree finish_base_specifier (tree, tree, bool); extern void finish_member_declaration (tree); -extern void qualified_name_lookup_error (tree, tree, tree); +extern void qualified_name_lookup_error (tree, tree, tree, + location_t); extern void check_template_keyword (tree); extern tree finish_id_expression (tree, tree, tree, cp_id_kind *, bool, bool, bool *, bool, bool, bool, bool, - const char **); + const char **, + location_t); extern tree finish_typeof (tree); extern tree finish_offsetof (tree); extern void finish_decl_cleanup (tree, tree); diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 767d14d2a61..2429bfc20a8 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -1593,7 +1593,7 @@ static tree cp_parser_postfix_expression static tree cp_parser_postfix_open_square_expression (cp_parser *, tree, bool); static tree cp_parser_postfix_dot_deref_expression - (cp_parser *, enum cpp_ttype, tree, bool, cp_id_kind *); + (cp_parser *, enum cpp_ttype, tree, bool, cp_id_kind *, location_t); static tree cp_parser_parenthesized_expression_list (cp_parser *, bool, bool, bool, bool *); static void cp_parser_pseudo_destructor_name @@ -1904,15 +1904,15 @@ static tree cp_parser_objc_statement /* Utility Routines */ static tree cp_parser_lookup_name - (cp_parser *, tree, enum tag_types, bool, bool, bool, tree *); + (cp_parser *, tree, enum tag_types, bool, bool, bool, tree *, location_t); static tree cp_parser_lookup_name_simple - (cp_parser *, tree); + (cp_parser *, tree, location_t); static tree cp_parser_maybe_treat_template_as_class (tree, bool); static bool cp_parser_check_declarator_template_parameters - (cp_parser *, cp_declarator *); + (cp_parser *, cp_declarator *, location_t); static bool cp_parser_check_template_parameters - (cp_parser *, unsigned); + (cp_parser *, unsigned, location_t); static tree cp_parser_simple_cast_expression (cp_parser *); static tree cp_parser_global_scope_opt @@ -1948,7 +1948,7 @@ static tree cp_parser_trait_expr static bool cp_parser_declares_only_class_p (cp_parser *); static void cp_parser_set_storage_class - (cp_parser *, cp_decl_specifier_seq *, enum rid); + (cp_parser *, cp_decl_specifier_seq *, enum rid, location_t); static void cp_parser_set_decl_spec_type (cp_decl_specifier_seq *, tree, bool); static bool cp_parser_friend_p @@ -1970,7 +1970,7 @@ static enum tag_types cp_parser_token_is_class_key static void cp_parser_check_class_key (enum tag_types, tree type); static void cp_parser_check_access_in_redeclaration - (tree type); + (tree type, location_t location); static bool cp_parser_optional_template_keyword (cp_parser *); static void cp_parser_pre_parsed_nested_name_specifier @@ -1992,7 +1992,7 @@ static bool cp_parser_uncommitted_to_tentative_parse_p static void cp_parser_error (cp_parser *, const char *); static void cp_parser_name_lookup_error - (cp_parser *, tree, tree, const char *); + (cp_parser *, tree, tree, const char *, location_t); static bool cp_parser_simulate_error (cp_parser *); static bool cp_parser_check_type_definition @@ -2004,7 +2004,7 @@ static void cp_parser_check_for_invalid_template_id static bool cp_parser_non_integral_constant_expression (cp_parser *, const char *); static void cp_parser_diagnose_invalid_type_name - (cp_parser *, tree, tree); + (cp_parser *, tree, tree, location_t); static bool cp_parser_parse_and_diagnose_invalid_type_name (cp_parser *); static int cp_parser_skip_to_closing_parenthesis @@ -2030,7 +2030,7 @@ static bool cp_parser_is_string_literal static bool cp_parser_is_keyword (cp_token *, enum rid); static tree cp_parser_make_typename_type - (cp_parser *, tree, tree); + (cp_parser *, tree, tree, location_t location); static cp_declarator * cp_parser_make_indirect_declarator (enum tree_code, tree, cp_cv_quals, cp_declarator *); @@ -2079,7 +2079,7 @@ cp_parser_error (cp_parser* parser, const char* message) if (token->type == CPP_PRAGMA) { - error ("%<#pragma%> is not allowed here"); + error ("%H%<#pragma%> is not allowed here", &token->location); cp_parser_skip_to_pragma_eol (parser, token); return; } @@ -2102,33 +2102,34 @@ static void cp_parser_name_lookup_error (cp_parser* parser, tree name, tree decl, - const char* desired) + const char* desired, + location_t location) { /* If name lookup completely failed, tell the user that NAME was not declared. */ if (decl == error_mark_node) { if (parser->scope && parser->scope != global_namespace) - error ("%<%E::%E%> has not been declared", - parser->scope, name); + error ("%H%<%E::%E%> has not been declared", + &location, parser->scope, name); else if (parser->scope == global_namespace) - error ("%<::%E%> has not been declared", name); + error ("%H%<::%E%> has not been declared", &location, name); else if (parser->object_scope && !CLASS_TYPE_P (parser->object_scope)) - error ("request for member %qE in non-class type %qT", - name, parser->object_scope); + error ("%Hrequest for member %qE in non-class type %qT", + &location, name, parser->object_scope); else if (parser->object_scope) - error ("%<%T::%E%> has not been declared", - parser->object_scope, name); + error ("%H%<%T::%E%> has not been declared", + &location, parser->object_scope, name); else - error ("%qE has not been declared", name); + error ("%H%qE has not been declared", &location, name); } else if (parser->scope && parser->scope != global_namespace) - error ("%<%E::%E%> %s", parser->scope, name, desired); + error ("%H%<%E::%E%> %s", &location, parser->scope, name, desired); else if (parser->scope == global_namespace) - error ("%<::%E%> %s", name, desired); + error ("%H%<::%E%> %s", &location, name, desired); else - error ("%qE %s", name, desired); + error ("%H%qE %s", &location, name, desired); } /* If we are parsing tentatively, remember that an error has occurred @@ -2149,7 +2150,8 @@ cp_parser_simulate_error (cp_parser* parser) /* Check for repeated decl-specifiers. */ static void -cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs) +cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs, + location_t location) { cp_decl_spec ds; @@ -2162,10 +2164,11 @@ cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs) if (ds == ds_long) { if (count > 2) - error ("% is too long for GCC"); + error ("%H% is too long for GCC", &location); else if (pedantic && !in_system_header && warn_long_long && cxx_dialect == cxx98) - pedwarn ("ISO C++ 1998 does not support %"); + pedwarn ("%HISO C++ 1998 does not support %", + &location); } else if (count > 1) { @@ -2185,7 +2188,7 @@ cp_parser_check_decl_spec (cp_decl_specifier_seq *decl_specs) "__complex", "__thread" }; - error ("duplicate %qs", decl_spec_names[(int)ds]); + error ("%Hduplicate %qs", &location, decl_spec_names[(int)ds]); } } } @@ -2301,13 +2304,15 @@ cp_parser_non_integral_constant_expression (cp_parser *parser, in duplicate error messages.) */ static void -cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree scope, tree id) +cp_parser_diagnose_invalid_type_name (cp_parser *parser, + tree scope, tree id, + location_t id_location) { tree decl, old_scope; /* Try to lookup the identifier. */ old_scope = parser->scope; parser->scope = scope; - decl = cp_parser_lookup_name_simple (parser, id); + decl = cp_parser_lookup_name_simple (parser, id, id_location); parser->scope = old_scope; /* If the lookup found a template-name, it means that the user forgot to specify an argument list. Emit a useful error message. */ @@ -2392,6 +2397,7 @@ static bool cp_parser_parse_and_diagnose_invalid_type_name (cp_parser *parser) { tree id; + cp_token *token = cp_lexer_peek_token (parser->lexer); cp_parser_parse_tentatively (parser); id = cp_parser_id_expression (parser, @@ -2415,7 +2421,8 @@ cp_parser_parse_and_diagnose_invalid_type_name (cp_parser *parser) return false; /* Emit a diagnostic for the invalid type. */ - cp_parser_diagnose_invalid_type_name (parser, parser->scope, id); + cp_parser_diagnose_invalid_type_name (parser, parser->scope, + id, token->location); /* Skip to the end of the declaration; there's no point in trying to process it. */ cp_parser_skip_to_end_of_block_or_statement (parser); @@ -2703,7 +2710,8 @@ cp_parser_require_pragma_eol (cp_parser *parser, cp_token *pragma_tok) using cp_parser_diagnose_invalid_type_name. */ static tree -cp_parser_make_typename_type (cp_parser *parser, tree scope, tree id) +cp_parser_make_typename_type (cp_parser *parser, tree scope, + tree id, location_t id_location) { tree result; if (TREE_CODE (id) == IDENTIFIER_NODE) @@ -2711,7 +2719,7 @@ cp_parser_make_typename_type (cp_parser *parser, tree scope, tree id) result = make_typename_type (scope, id, typename_type, /*complain=*/tf_none); if (result == error_mark_node) - cp_parser_diagnose_invalid_type_name (parser, scope, id); + cp_parser_diagnose_invalid_type_name (parser, scope, id, id_location); return result; } return make_typename_type (scope, id, typename_type, tf_error); @@ -2929,7 +2937,8 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok) if (type == CPP_STRING) type = tok->type; else if (tok->type != CPP_STRING) - error ("unsupported non-standard concatenation of string literals"); + error ("%Hunsupported non-standard concatenation " + "of string literals", &tok->location); } obstack_grow (&str_ob, &str, sizeof (cpp_string)); @@ -3108,7 +3117,7 @@ cp_parser_primary_expression (cp_parser *parser, bool template_arg_p, cp_id_kind *idk) { - cp_token *token; + cp_token *token = NULL; /* Assume the primary expression is not an id-expression. */ *idk = CP_ID_KIND_NONE; @@ -3206,7 +3215,8 @@ cp_parser_primary_expression (cp_parser *parser, { /* Statement-expressions are not allowed by the standard. */ if (pedantic) - pedwarn ("ISO C++ forbids braced-groups within expressions"); + pedwarn ("%HISO C++ forbids braced-groups within expressions", + &token->location); /* And they're not allowed outside of a function-body; you cannot, for example, write: @@ -3217,8 +3227,9 @@ cp_parser_primary_expression (cp_parser *parser, if (!parser->in_function_body || parser->in_template_argument_list_p) { - error ("statement-expressions are not allowed outside " - "functions nor in template-argument lists"); + error ("%Hstatement-expressions are not allowed outside " + "functions nor in template-argument lists", + &token->location); cp_parser_skip_to_end_of_block_or_statement (parser); expr = error_mark_node; } @@ -3275,7 +3286,8 @@ cp_parser_primary_expression (cp_parser *parser, cp_lexer_consume_token (parser->lexer); if (parser->local_variables_forbidden_p) { - error ("% may not be used in this context"); + error ("%H% may not be used in this context", + &token->location); return error_mark_node; } /* Pointers cannot appear in constant-expressions. */ @@ -3375,6 +3387,7 @@ cp_parser_primary_expression (cp_parser *parser, const char *error_msg; bool template_p; bool done; + cp_token *id_expr_token; id_expression: /* Parse the id-expression. */ @@ -3387,6 +3400,7 @@ cp_parser_primary_expression (cp_parser *parser, /*optional_p=*/false); if (id_expression == error_mark_node) return error_mark_node; + id_expr_token = token; token = cp_lexer_peek_token (parser->lexer); done = (token->type != CPP_OPEN_SQUARE && token->type != CPP_OPEN_PAREN @@ -3410,7 +3424,8 @@ cp_parser_primary_expression (cp_parser *parser, template_p, /*is_namespace=*/false, /*check_dependency=*/true, - &ambiguous_decls); + &ambiguous_decls, + id_expr_token->location); /* If the lookup was ambiguous, an error will already have been issued. */ if (ambiguous_decls) @@ -3457,8 +3472,8 @@ cp_parser_primary_expression (cp_parser *parser, decl = check_for_out_of_scope_variable (decl); if (local_variable_p (decl)) { - error ("local variable %qD may not appear in this context", - decl); + error ("%Hlocal variable %qD may not appear in this context", + &id_expr_token->location, decl); return error_mark_node; } } @@ -3472,7 +3487,8 @@ cp_parser_primary_expression (cp_parser *parser, &parser->non_integral_constant_expression_p, template_p, done, address_p, template_arg_p, - &error_msg)); + &error_msg, + id_expr_token->location)); if (error_msg) cp_parser_error (parser, error_msg); return decl; @@ -3756,7 +3772,8 @@ cp_parser_unqualified_id (cp_parser* parser, if (scope && TREE_CODE (scope) == NAMESPACE_DECL) { if (!cp_parser_uncommitted_to_tentative_parse_p (parser)) - error ("scope %qT before %<~%> is not a class-name", scope); + error ("%Hscope %qT before %<~%> is not a class-name", + &token->location, scope); cp_parser_simulate_error (parser); if (cp_lexer_next_token_is (parser->lexer, CPP_NAME)) cp_lexer_consume_token (parser->lexer); @@ -3857,8 +3874,8 @@ cp_parser_unqualified_id (cp_parser* parser, if (declarator_p && scope && !check_dtor_name (scope, type_decl)) { if (!cp_parser_uncommitted_to_tentative_parse_p (parser)) - error ("declaration of %<~%T%> as member of %qT", - type_decl, scope); + error ("%Hdeclaration of %<~%T%> as member of %qT", + &token->location, type_decl, scope); cp_parser_simulate_error (parser); return error_mark_node; } @@ -3871,8 +3888,8 @@ cp_parser_unqualified_id (cp_parser* parser, && !DECL_IMPLICIT_TYPEDEF_P (type_decl) && !DECL_SELF_REFERENCE_P (type_decl) && !cp_parser_uncommitted_to_tentative_parse_p (parser)) - error ("typedef-name %qD used as destructor declarator", - type_decl); + error ("%Htypedef-name %qD used as destructor declarator", + &token->location, type_decl); return build_nt (BIT_NOT_EXPR, TREE_TYPE (type_decl)); } @@ -4076,20 +4093,23 @@ cp_parser_nested_name_specifier_opt (cp_parser *parser, /*is_template=*/false, /*is_namespace=*/false, /*check_dependency=*/true, - &ambiguous_decls); + &ambiguous_decls, + token->location); if (TREE_CODE (decl) == TEMPLATE_DECL) - error ("%qD used without template parameters", decl); + error ("%H%qD used without template parameters", + &token->location, decl); else if (ambiguous_decls) { - error ("reference to %qD is ambiguous", - token->u.value); + error ("%Hreference to %qD is ambiguous", + &token->location, token->u.value); print_candidates (ambiguous_decls); decl = error_mark_node; } else cp_parser_name_lookup_error (parser, token->u.value, decl, - "is not a class or namespace"); + "is not a class or namespace", + token->location); } parser->scope = error_mark_node; error_p = true; @@ -4746,7 +4766,8 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p, postfix_expression = cp_parser_postfix_dot_deref_expression (parser, token->type, postfix_expression, - false, &idk); + false, &idk, + token->location); is_member_access = true; break; @@ -4860,7 +4881,8 @@ static tree cp_parser_postfix_dot_deref_expression (cp_parser *parser, enum cpp_ttype token_type, tree postfix_expression, - bool for_offsetof, cp_id_kind *idk) + bool for_offsetof, cp_id_kind *idk, + location_t location) { tree name; bool dependent_p; @@ -4892,7 +4914,7 @@ cp_parser_postfix_dot_deref_expression (cp_parser *parser, /* The type of the POSTFIX_EXPRESSION must be complete. */ if (scope == unknown_type_node) { - error ("%qE does not have class type", postfix_expression); + error ("%H%qE does not have class type", &location, postfix_expression); scope = NULL_TREE; } else @@ -4948,6 +4970,7 @@ cp_parser_postfix_dot_deref_expression (cp_parser *parser, ordinary class member access expression, rather than a pseudo-destructor-name. */ bool template_p; + cp_token *token = cp_lexer_peek_token (parser->lexer); /* Parse the id-expression. */ name = (cp_parser_id_expression (parser, @@ -4975,7 +4998,7 @@ cp_parser_postfix_dot_deref_expression (cp_parser *parser, TYPE_DECL here. That is invalid code. */ if (TREE_CODE (name) == TYPE_DECL) { - error ("invalid use of %qD", name); + error ("%Hinvalid use of %qD", &token->location, name); postfix_expression = error_mark_node; } else @@ -5538,18 +5561,21 @@ cp_parser_new_expression (cp_parser* parser) type-id. */ if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN)) { + cp_token *token; /* Consume the `('. */ cp_lexer_consume_token (parser->lexer); /* Parse the type-id. */ type = cp_parser_type_id (parser); /* Look for the closing `)'. */ cp_parser_require (parser, CPP_CLOSE_PAREN, "%<)%>"); + token = cp_lexer_peek_token (parser->lexer); /* There should not be a direct-new-declarator in this production, but GCC used to allowed this, so we check and emit a sensible error message for this case. */ if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_SQUARE)) { - error ("array bound forbidden after parenthesized type-id"); + error ("%Harray bound forbidden after parenthesized type-id", + &token->location); inform ("try removing the parentheses around the type-id"); cp_parser_direct_new_declarator (parser); } @@ -5727,6 +5753,7 @@ cp_parser_direct_new_declarator (cp_parser* parser) /* The first expression is not required to be constant. */ if (!declarator) { + cp_token *token = cp_lexer_peek_token (parser->lexer); expression = cp_parser_expression (parser, /*cast_p=*/false); /* The standard requires that the expression have integral type. DR 74 adds enumeration types. We believe that the @@ -5742,8 +5769,8 @@ cp_parser_direct_new_declarator (cp_parser* parser) /*complain=*/true); if (!expression) { - error ("expression in new-declarator must have integral " - "or enumeration type"); + error ("%Hexpression in new-declarator must have integral " + "or enumeration type", &token->location); expression = error_mark_node; } } @@ -6484,6 +6511,7 @@ cp_parser_builtin_offsetof (cp_parser *parser) int save_ice_p, save_non_ice_p; tree type, expr; cp_id_kind dummy; + cp_token *token; /* We're about to accept non-integral-constant things, but will definitely yield an integral constant expression. Save and @@ -6499,6 +6527,7 @@ cp_parser_builtin_offsetof (cp_parser *parser) type = cp_parser_type_id (parser); /* Look for the `,'. */ cp_parser_require (parser, CPP_COMMA, "%<,%>"); + token = cp_lexer_peek_token (parser->lexer); /* Build the (type *)null that begins the traditional offsetof macro. */ expr = build_static_cast (build_pointer_type (type), null_pointer_node, @@ -6506,10 +6535,10 @@ cp_parser_builtin_offsetof (cp_parser *parser) /* Parse the offsetof-member-designator. We begin as if we saw "expr->". */ expr = cp_parser_postfix_dot_deref_expression (parser, CPP_DEREF, expr, - true, &dummy); + true, &dummy, token->location); while (true) { - cp_token *token = cp_lexer_peek_token (parser->lexer); + token = cp_lexer_peek_token (parser->lexer); switch (token->type) { case CPP_OPEN_SQUARE: @@ -6521,7 +6550,8 @@ cp_parser_builtin_offsetof (cp_parser *parser) /* offsetof-member-designator "." identifier */ cp_lexer_consume_token (parser->lexer); expr = cp_parser_postfix_dot_deref_expression (parser, CPP_DOT, expr, - true, &dummy); + true, &dummy, + token->location); break; case CPP_CLOSE_PAREN: @@ -6883,7 +6913,8 @@ cp_parser_label_for_labeled_statement (cp_parser* parser) if (parser->in_switch_statement_p) finish_case_label (expr, expr_hi); else - error ("case label %qE not within a switch statement", expr); + error ("%Hcase label %qE not within a switch statement", + &token->location, expr); } break; @@ -6894,7 +6925,7 @@ cp_parser_label_for_labeled_statement (cp_parser* parser) if (parser->in_switch_statement_p) finish_case_label (NULL_TREE, NULL_TREE); else - error ("case label not within a switch statement"); + error ("%Hcase label not within a switch statement", &token->location); break; default: @@ -7012,7 +7043,7 @@ cp_parser_statement_seq_opt (cp_parser* parser, tree in_statement_expr) else { token = cp_lexer_consume_token (parser->lexer); - error ("% without a previous %"); + error ("%H% without a previous %", &token->location); } } @@ -7514,7 +7545,7 @@ cp_parser_jump_statement (cp_parser* parser) switch (in_statement) { case 0: - error ("break statement not within loop or switch"); + error ("%Hbreak statement not within loop or switch", &token->location); break; default: gcc_assert ((in_statement & IN_SWITCH_STMT) @@ -7522,10 +7553,10 @@ cp_parser_jump_statement (cp_parser* parser) statement = finish_break_stmt (); break; case IN_OMP_BLOCK: - error ("invalid exit from OpenMP structured block"); + error ("%Hinvalid exit from OpenMP structured block", &token->location); break; case IN_OMP_FOR: - error ("break statement used with OpenMP for loop"); + error ("%Hbreak statement used with OpenMP for loop", &token->location); break; } cp_parser_require (parser, CPP_SEMICOLON, "%<;%>"); @@ -7535,14 +7566,14 @@ cp_parser_jump_statement (cp_parser* parser) switch (parser->in_statement & ~(IN_SWITCH_STMT | IN_IF_STMT)) { case 0: - error ("continue statement not within a loop"); + error ("%Hcontinue statement not within a loop", &token->location); break; case IN_ITERATION_STMT: case IN_OMP_FOR: statement = finish_continue_stmt (); break; case IN_OMP_BLOCK: - error ("invalid exit from OpenMP structured block"); + error ("%Hinvalid exit from OpenMP structured block", &token->location); break; default: gcc_unreachable (); @@ -7579,7 +7610,7 @@ cp_parser_jump_statement (cp_parser* parser) { /* Issue a warning about this use of a GNU extension. */ if (pedantic) - pedwarn ("ISO C++ forbids computed gotos"); + pedwarn ("%HISO C++ forbids computed gotos", &token->location); /* Consume the '*' token. */ cp_lexer_consume_token (parser->lexer); /* Parse the dependent expression. */ @@ -7940,7 +7971,7 @@ cp_parser_block_declaration (cp_parser *parser, else if (token1->keyword == RID_LABEL) { cp_lexer_consume_token (parser->lexer); - error ("%<__label__%> not at the beginning of a block"); + error ("%H%<__label__%> not at the beginning of a block", &token1->location); cp_parser_skip_to_end_of_statement (parser); /* If the next token is now a `;', consume it. */ if (cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON)) @@ -8074,7 +8105,11 @@ cp_parser_simple_declaration (cp_parser* parser, which is erroneous. */ if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA)) - error ("mixing declarations and function-definitions is forbidden"); + { + cp_token *token = cp_lexer_peek_token (parser->lexer); + error ("%Hmixing declarations and function-definitions is forbidden", + &token->location); + } /* Otherwise, we're done with the list of declarators. */ else { @@ -8170,6 +8205,7 @@ cp_parser_decl_specifier_seq (cp_parser* parser, int* declares_class_or_enum) { bool constructor_possible_p = !parser->in_declarator_p; + cp_token *start_token = NULL; /* Clear DECL_SPECS. */ clear_decl_specs (decl_specs); @@ -8186,6 +8222,11 @@ cp_parser_decl_specifier_seq (cp_parser* parser, /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); + + /* Save the first token of the decl spec list for error + reporting. */ + if (!start_token) + start_token = token; /* Handle attributes. */ if (token->keyword == RID_ATTRIBUTE) { @@ -8262,15 +8303,17 @@ cp_parser_decl_specifier_seq (cp_parser* parser, we're complaining about C++0x compatibility. */ warning (OPT_Wc__0x_compat, - "% will change meaning in C++0x; please remove it"); + "%H% will change meaning in C++0x; please remove it", + &token->location); /* Set the storage class anyway. */ - cp_parser_set_storage_class (parser, decl_specs, RID_AUTO); + cp_parser_set_storage_class (parser, decl_specs, RID_AUTO, + token->location); } else /* We do not yet support the use of `auto' as a type-specifier. */ - error ("C++0x % specifier not supported"); + error ("%HC++0x % specifier not supported", &token->location); break; case RID_REGISTER: @@ -8279,7 +8322,8 @@ cp_parser_decl_specifier_seq (cp_parser* parser, case RID_MUTABLE: /* Consume the token. */ cp_lexer_consume_token (parser->lexer); - cp_parser_set_storage_class (parser, decl_specs, token->keyword); + cp_parser_set_storage_class (parser, decl_specs, token->keyword, + token->location); break; case RID_THREAD: /* Consume the token. */ @@ -8315,7 +8359,6 @@ cp_parser_decl_specifier_seq (cp_parser* parser, /*is_declaration=*/true, &decl_spec_declares_class_or_enum, &is_cv_qualifier); - *declares_class_or_enum |= decl_spec_declares_class_or_enum; /* If this type-specifier referenced a user-defined type @@ -8375,12 +8418,13 @@ cp_parser_decl_specifier_seq (cp_parser* parser, flags |= CP_PARSER_FLAGS_OPTIONAL; } - cp_parser_check_decl_spec (decl_specs); + cp_parser_check_decl_spec (decl_specs, start_token->location); /* Don't allow a friend specifier with a class definition. */ if (decl_specs->specs[(int) ds_friend] != 0 && (*declares_class_or_enum & 2)) - error ("class definition may not be declared a friend"); + error ("%Hclass definition may not be declared a friend", + &start_token->location); } /* Parse an (optional) storage-class-specifier. @@ -8436,7 +8480,8 @@ static tree cp_parser_function_specifier_opt (cp_parser* parser, cp_decl_specifier_seq *decl_specs) { - switch (cp_lexer_peek_token (parser->lexer)->keyword) + cp_token *token = cp_lexer_peek_token (parser->lexer); + switch (token->keyword) { case RID_INLINE: if (decl_specs) @@ -8448,7 +8493,7 @@ cp_parser_function_specifier_opt (cp_parser* parser, A member function template shall not be virtual. */ if (PROCESSING_REAL_TEMPLATE_DECL_P ()) - error ("templates may not be %"); + error ("%Htemplates may not be %", &token->location); else if (decl_specs) ++decl_specs->specs[(int) ds_virtual]; break; @@ -8602,6 +8647,7 @@ cp_parser_decltype (cp_parser *parser) const char *saved_message; bool saved_integral_constant_expression_p; bool saved_non_integral_constant_expression_p; + cp_token *id_expr_start_token; /* Look for the `decltype' token. */ if (!cp_parser_require_keyword (parser, RID_DECLTYPE, "%")) @@ -8631,6 +8677,7 @@ cp_parser_decltype (cp_parser *parser) return error_mark_node; /* First, try parsing an id-expression. */ + id_expr_start_token = cp_lexer_peek_token (parser->lexer); cp_parser_parse_tentatively (parser); expr = cp_parser_id_expression (parser, /*template_keyword_p=*/false, @@ -8653,7 +8700,8 @@ cp_parser_decltype (cp_parser *parser) /*is_template=*/false, /*is_namespace=*/false, /*check_dependency=*/true, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + id_expr_start_token->location); if (expr && expr != error_mark_node @@ -8673,7 +8721,8 @@ cp_parser_decltype (cp_parser *parser) /*done=*/true, /*address_p=*/false, /*template_arg_p=*/false, - &error_msg)); + &error_msg, + id_expr_start_token->location)); if (expr == error_mark_node) /* We found an id-expression, but it was something that we @@ -8916,17 +8965,20 @@ static void cp_parser_mem_initializer_list (cp_parser* parser) { tree mem_initializer_list = NULL_TREE; + cp_token *token = cp_lexer_peek_token (parser->lexer); /* Let the semantic analysis code know that we are starting the mem-initializer-list. */ if (!DECL_CONSTRUCTOR_P (current_function_decl)) - error ("only constructors take base initializers"); + error ("%Honly constructors take base initializers", + &token->location); /* Loop through the list. */ while (true) { tree mem_initializer; + token = cp_lexer_peek_token (parser->lexer); /* Parse the mem-initializer. */ mem_initializer = cp_parser_mem_initializer (parser); /* If the next token is a `...', we're expanding member initializers. */ @@ -8940,8 +8992,8 @@ cp_parser_mem_initializer_list (cp_parser* parser) if (mem_initializer != error_mark_node && !TYPE_P (TREE_PURPOSE (mem_initializer))) { - error ("cannot expand initializer for member %<%D%>", - TREE_PURPOSE (mem_initializer)); + error ("%Hcannot expand initializer for member %<%D%>", + &token->location, TREE_PURPOSE (mem_initializer)); mem_initializer = error_mark_node; } @@ -8989,11 +9041,13 @@ cp_parser_mem_initializer (cp_parser* parser) tree mem_initializer_id; tree expression_list; tree member; + cp_token *token = cp_lexer_peek_token (parser->lexer); /* Find out what is being initialized. */ if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN)) { - permerror ("anachronistic old-style base class initializer"); + permerror ("%Hanachronistic old-style base class initializer", + &token->location); mem_initializer_id = NULL_TREE; } else @@ -9044,11 +9098,14 @@ cp_parser_mem_initializer_id (cp_parser* parser) bool template_p = false; tree id; + cp_token *token = cp_lexer_peek_token (parser->lexer); + /* `typename' is not allowed in this context ([temp.res]). */ if (cp_lexer_next_token_is_keyword (parser->lexer, RID_TYPENAME)) { - error ("keyword % not allowed in this context (a qualified " - "member initializer is implicitly a type)"); + error ("%Hkeyword % not allowed in this context (a qualified " + "member initializer is implicitly a type)", + &token->location); cp_lexer_consume_token (parser->lexer); } /* Look for the optional `::' operator. */ @@ -9565,6 +9622,7 @@ cp_parser_template_parameter (cp_parser* parser, bool *is_non_type, appropriate diagnostic here. */ /* Consume the `='. */ + cp_token *start_token = cp_lexer_peek_token (parser->lexer); cp_lexer_consume_token (parser->lexer); /* Find the name of the parameter pack. */ @@ -9573,10 +9631,11 @@ cp_parser_template_parameter (cp_parser* parser, bool *is_non_type, id_declarator = id_declarator->declarator; if (id_declarator && id_declarator->kind == cdk_id) - error ("template parameter pack %qD cannot have a default argument", - id_declarator->u.id.unqualified_name); + error ("%Htemplate parameter pack %qD cannot have a default argument", + &start_token->location, id_declarator->u.id.unqualified_name); else - error ("template parameter pack cannot have a default argument"); + error ("%Htemplate parameter pack cannot have a default argument", + &start_token->location); /* Parse the default argument, but throw away the result. */ cp_parser_default_argument (parser, /*template_parm_p=*/true); @@ -9670,10 +9729,11 @@ cp_parser_type_parameter (cp_parser* parser, bool *is_parameter_pack) if (*is_parameter_pack) { if (identifier) - error ("template parameter pack %qD cannot have a default argument", - identifier); + error ("%Htemplate parameter pack %qD cannot have a " + "default argument", &token->location, identifier); else - error ("template parameter packs cannot have default arguments"); + error ("%Htemplate parameter packs cannot have " + "default arguments", &token->location); default_argument = NULL_TREE; } pop_deferring_access_checks (); @@ -9741,6 +9801,9 @@ cp_parser_type_parameter (cp_parser* parser, bool *is_parameter_pack) cp_lexer_consume_token (parser->lexer); /* Parse the id-expression. */ push_deferring_access_checks (dk_no_deferred); + /* save token before parsing the id-expression, for error + reporting */ + token = cp_lexer_peek_token (parser->lexer); default_argument = cp_parser_id_expression (parser, /*template_keyword_p=*/false, @@ -9761,7 +9824,8 @@ cp_parser_type_parameter (cp_parser* parser, bool *is_parameter_pack) /*is_template=*/is_template, /*is_namespace=*/false, /*check_dependency=*/true, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + token->location); /* See if the default argument is valid. */ default_argument = check_template_template_default_arg (default_argument); @@ -9771,10 +9835,13 @@ cp_parser_type_parameter (cp_parser* parser, bool *is_parameter_pack) if (*is_parameter_pack) { if (identifier) - error ("template parameter pack %qD cannot have a default argument", - identifier); + error ("%Htemplate parameter pack %qD cannot " + "have a default argument", + &token->location, identifier); else - error ("template parameter packs cannot have default arguments"); + error ("%Htemplate parameter packs cannot " + "have default arguments", + &token->location); default_argument = NULL_TREE; } pop_deferring_access_checks (); @@ -9823,7 +9890,7 @@ cp_parser_template_id (cp_parser *parser, cp_token_position start_of_id = 0; deferred_access_check *chk; VEC (deferred_access_check,gc) *access_check; - cp_token *next_token, *next_token_2; + cp_token *next_token = NULL, *next_token_2 = NULL, *token = NULL; bool is_identifier; /* If the next token corresponds to a template-id, there is no need @@ -9871,6 +9938,7 @@ cp_parser_template_id (cp_parser *parser, /* Parse the template-name. */ is_identifier = false; + token = cp_lexer_peek_token (parser->lexer); template = cp_parser_template_name (parser, template_keyword_p, check_dependency_p, is_declaration, @@ -9897,6 +9965,7 @@ cp_parser_template_id (cp_parser *parser, /* Consume the first token (CPP_OPEN_SQUARE - which we pretend it is CPP_LESS. */ cp_lexer_consume_token (parser->lexer); + /* Parse the arguments. */ arguments = cp_parser_enclosed_template_argument_list (parser); if (!cp_parser_parse_definitely (parser)) @@ -9911,15 +9980,18 @@ cp_parser_template_id (cp_parser *parser, } /* Otherwise, emit an error about the invalid digraph, but continue parsing because we got our argument list. */ - permerror ("%<<::%> cannot begin a template-argument list"); - inform ("%<<:%> is an alternate spelling for %<[%>. Insert whitespace " - "between %<<%> and %<::%>"); + permerror ("%H%<<::%> cannot begin a template-argument list", + &next_token->location); + inform ("%H%<<:%> is an alternate spelling for %<[%>. Insert whitespace " + "between %<<%> and %<::%>", + &next_token->location); if (!flag_permissive) { static bool hint; if (!hint) { - inform ("(if you use %<-fpermissive%> G++ will accept your code)"); + inform ("%H(if you use %<-fpermissive%> G++ will accept your code)", + &next_token->location); hint = true; } } @@ -9992,7 +10064,8 @@ cp_parser_template_id (cp_parser *parser, user, as opposed to simply marking the tentative parse as failed? */ if (cp_parser_error_occurred (parser) && template_id != error_mark_node) - error ("parse error in template argument list"); + error ("%Hparse error in template argument list", + &token->location); } pop_deferring_access_checks (); @@ -10046,6 +10119,7 @@ cp_parser_template_name (cp_parser* parser, tree identifier; tree decl; tree fns; + cp_token *token = cp_lexer_peek_token (parser->lexer); /* If the next token is `operator', then we have either an operator-function-id or a conversion-function-id. */ @@ -10105,7 +10179,8 @@ cp_parser_template_name (cp_parser* parser, cp_token_position start = 0; /* Explain what went wrong. */ - error ("non-template %qD used as template", identifier); + error ("%Hnon-template %qD used as template", + &token->location, identifier); inform ("use %<%T::template %D%> to indicate that it is a template", parser->scope, identifier); /* If parsing tentatively, find the location of the "<" token. */ @@ -10149,7 +10224,8 @@ cp_parser_template_name (cp_parser* parser, /*is_template=*/false, /*is_namespace=*/false, check_dependency_p, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + token->location); decl = maybe_get_template_decl_from_type_decl (decl); /* If DECL is a template, then the name was a template-name. */ @@ -10295,7 +10371,7 @@ cp_parser_template_argument (cp_parser* parser) bool template_p; bool address_p; bool maybe_type_id = false; - cp_token *token; + cp_token *token = NULL, *argument_start_token = NULL; cp_id_kind idk; /* There's really no way to know what we're looking at, so we just @@ -10342,6 +10418,7 @@ cp_parser_template_argument (cp_parser* parser) /* We're still not sure what the argument will be. */ cp_parser_parse_tentatively (parser); /* Try a template. */ + argument_start_token = cp_lexer_peek_token (parser->lexer); argument = cp_parser_id_expression (parser, /*template_keyword_p=*/false, /*check_dependency_p=*/true, @@ -10364,7 +10441,8 @@ cp_parser_template_argument (cp_parser* parser) /*is_template=*/template_p, /*is_namespace=*/false, /*check_dependency=*/true, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + argument_start_token->location); if (TREE_CODE (argument) != TEMPLATE_DECL && TREE_CODE (argument) != UNBOUND_CLASS_TEMPLATE) cp_parser_error (parser, "expected template-name"); @@ -10616,6 +10694,8 @@ static void cp_parser_explicit_specialization (cp_parser* parser) { bool need_lang_pop; + cp_token *token = cp_lexer_peek_token (parser->lexer); + /* Look for the `template' keyword. */ cp_parser_require_keyword (parser, RID_TEMPLATE, "%"); /* Look for the `<'. */ @@ -10630,7 +10710,7 @@ cp_parser_explicit_specialization (cp_parser* parser) linkage. */ if (current_lang_name == lang_name_c) { - error ("template specialization with C linkage"); + error ("%Htemplate specialization with C linkage", &token->location); /* Give it C++ linkage to avoid confusing other parts of the front end. */ push_lang_context (lang_name_cplusplus); @@ -10955,7 +11035,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, cp_lexer_consume_token (parser->lexer); /* We do not yet support the use of `auto' as a type-specifier. */ - error ("C++0x % specifier not supported"); + error ("%HC++0x % specifier not supported", &token->location); } break; @@ -11168,12 +11248,13 @@ cp_parser_nonclass_name (cp_parser* parser) tree type_decl; tree identifier; + cp_token *token = cp_lexer_peek_token (parser->lexer); identifier = cp_parser_identifier (parser); if (identifier == error_mark_node) return error_mark_node; /* Look up the type-name. */ - type_decl = cp_parser_lookup_name_simple (parser, identifier); + type_decl = cp_parser_lookup_name_simple (parser, identifier, token->location); if (TREE_CODE (type_decl) != TYPE_DECL && (objc_is_id (identifier) || objc_is_class_name (identifier))) @@ -11190,7 +11271,7 @@ cp_parser_nonclass_name (cp_parser* parser) { if (!cp_parser_simulate_error (parser)) cp_parser_name_lookup_error (parser, identifier, type_decl, - "is not a type"); + "is not a type", token->location); return error_mark_node; } /* Remember that the name was used in the definition of the @@ -11239,6 +11320,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, tree identifier; tree type = NULL_TREE; tree attributes = NULL_TREE; + cp_token *token = NULL; /* See if we're looking at the `enum' keyword. */ if (cp_lexer_next_token_is_keyword (parser->lexer, RID_ENUM)) @@ -11308,6 +11390,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, if (!template_p) cp_parser_parse_tentatively (parser); /* Parse the template-id. */ + token = cp_lexer_peek_token (parser->lexer); decl = cp_parser_template_id (parser, template_p, /*check_dependency_p=*/true, is_declaration); @@ -11329,6 +11412,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, if (!type) { + token = cp_lexer_peek_token (parser->lexer); identifier = cp_parser_identifier (parser); if (identifier == error_mark_node) @@ -11341,7 +11425,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, if (tag_type == typename_type && TREE_CODE (parser->scope) != NAMESPACE_DECL) return cp_parser_make_typename_type (parser, parser->scope, - identifier); + identifier, + token->location); /* Look up a qualified name in the usual way. */ if (parser->scope) { @@ -11353,7 +11438,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, /*is_template=*/false, /*is_namespace=*/false, /*check_dependency=*/true, - &ambiguous_decls); + &ambiguous_decls, + token->location); /* If the lookup was ambiguous, an error will already have been issued. */ @@ -11389,7 +11475,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, { cp_parser_diagnose_invalid_type_name (parser, parser->scope, - identifier); + identifier, + token->location); return error_mark_node; } @@ -11489,7 +11576,8 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, /* An unqualified name was used to reference this type, so there were no qualifying templates. */ if (!cp_parser_check_template_parameters (parser, - /*num_templates=*/0)) + /*num_templates=*/0, + token->location)) return error_mark_node; type = xref_tag (tag_type, identifier, ts, template_p); } @@ -11692,6 +11780,8 @@ cp_parser_namespace_name (cp_parser* parser) tree identifier; tree namespace_decl; + cp_token *token = cp_lexer_peek_token (parser->lexer); + /* Get the name of the namespace. */ identifier = cp_parser_identifier (parser); if (identifier == error_mark_node) @@ -11720,13 +11810,14 @@ cp_parser_namespace_name (cp_parser* parser) /*is_template=*/false, /*is_namespace=*/true, /*check_dependency=*/true, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + token->location); /* If it's not a namespace, issue an error. */ if (namespace_decl == error_mark_node || TREE_CODE (namespace_decl) != NAMESPACE_DECL) { if (!cp_parser_uncommitted_to_tentative_parse_p (parser)) - error ("%qD is not a namespace-name", identifier); + error ("%H%qD is not a namespace-name", &token->location, identifier); cp_parser_error (parser, "expected namespace-name"); namespace_decl = error_mark_node; } @@ -11841,6 +11932,8 @@ cp_parser_namespace_alias_definition (cp_parser* parser) tree identifier; tree namespace_specifier; + cp_token *token = cp_lexer_peek_token (parser->lexer); + /* Look for the `namespace' keyword. */ cp_parser_require_keyword (parser, RID_NAMESPACE, "%"); /* Look for the identifier. */ @@ -11851,7 +11944,7 @@ cp_parser_namespace_alias_definition (cp_parser* parser) if (!cp_parser_uncommitted_to_tentative_parse_p (parser) && cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE)) { - error ("% definition is not allowed here"); + error ("%H% definition is not allowed here", &token->location); /* Skip the definition. */ cp_lexer_consume_token (parser->lexer); if (cp_parser_skip_to_closing_brace (parser)) @@ -11966,6 +12059,7 @@ cp_parser_using_declaration (cp_parser* parser, cp_parser_parse_definitely will be false, as required. */ return cp_parser_parse_definitely (parser); + token = cp_lexer_peek_token (parser->lexer); /* Parse the unqualified-id. */ identifier = cp_parser_unqualified_id (parser, /*template_keyword_p=*/false, @@ -11990,7 +12084,8 @@ cp_parser_using_declaration (cp_parser* parser, /* [namespace.udecl] A using declaration shall not name a template-id. */ - error ("a template-id may not appear in a using-declaration"); + error ("%Ha template-id may not appear in a using-declaration", + &token->location); else { if (at_class_scope_p ()) @@ -12006,9 +12101,13 @@ cp_parser_using_declaration (cp_parser* parser, } else { - decl = cp_parser_lookup_name_simple (parser, identifier); + decl = cp_parser_lookup_name_simple (parser, + identifier, + token->location); if (decl == error_mark_node) - cp_parser_name_lookup_error (parser, identifier, decl, NULL); + cp_parser_name_lookup_error (parser, identifier, + decl, NULL, + token->location); else if (check_for_bare_parameter_packs (decl)) return false; else if (!at_namespace_scope_p ()) @@ -12258,7 +12357,8 @@ cp_parser_init_declarator (cp_parser* parser, int declares_class_or_enum, bool* function_definition_p) { - cp_token *token; + cp_token *token = NULL, *asm_spec_start_token = NULL, + *attributes_start_token = NULL; cp_declarator *declarator; tree prefix_attributes; tree attributes; @@ -12292,6 +12392,7 @@ cp_parser_init_declarator (cp_parser* parser, resume_deferring_access_checks (); /* Parse the declarator. */ + token = cp_lexer_peek_token (parser->lexer); declarator = cp_parser_declarator (parser, CP_PARSER_DECLARATOR_NAMED, &ctor_dtor_or_conv_p, @@ -12306,7 +12407,8 @@ cp_parser_init_declarator (cp_parser* parser, return error_mark_node; /* Check that the number of template-parameter-lists is OK. */ - if (!cp_parser_check_declarator_template_parameters (parser, declarator)) + if (!cp_parser_check_declarator_template_parameters (parser, declarator, + token->location)) return error_mark_node; if (declares_class_or_enum & 2) @@ -12323,8 +12425,10 @@ cp_parser_init_declarator (cp_parser* parser, if (cp_parser_allow_gnu_extensions_p (parser)) { /* Look for an asm-specification. */ + asm_spec_start_token = cp_lexer_peek_token (parser->lexer); asm_specification = cp_parser_asm_specification_opt (parser); /* And attributes. */ + attributes_start_token = cp_lexer_peek_token (parser->lexer); attributes = cp_parser_attributes_opt (parser); } else @@ -12353,9 +12457,12 @@ cp_parser_init_declarator (cp_parser* parser, /* Neither attributes nor an asm-specification are allowed on a function-definition. */ if (asm_specification) - error ("an asm-specification is not allowed on a function-definition"); + error ("%Han asm-specification is not allowed " + "on a function-definition", + &asm_spec_start_token->location); if (attributes) - error ("attributes are not allowed on a function-definition"); + error ("%Hattributes are not allowed on a function-definition", + &attributes_start_token->location); /* This is a function-definition. */ *function_definition_p = true; @@ -12481,6 +12588,7 @@ cp_parser_init_declarator (cp_parser* parser, { if (function_declarator_p (declarator)) { + cp_token *initializer_start_token = cp_lexer_peek_token (parser->lexer); if (initialization_kind == CPP_EQ) initializer = cp_parser_pure_specifier (parser); else @@ -12489,7 +12597,8 @@ cp_parser_init_declarator (cp_parser* parser, know what the user intended, so just silently consume the initializer. */ if (decl != error_mark_node) - error ("initializer provided for function"); + error ("%Hinitializer provided for function", + &initializer_start_token->location); cp_parser_skip_to_closing_parenthesis (parser, /*recovering=*/true, /*or_comma=*/false, @@ -12891,7 +13000,8 @@ cp_parser_direct_declarator (cp_parser* parser, in function scopes. */ else if (!parser->in_function_body) { - error ("array bound is not an integer constant"); + error ("%Harray bound is not an integer constant", + &token->location); bounds = error_mark_node; } } @@ -12913,6 +13023,7 @@ cp_parser_direct_declarator (cp_parser* parser, special_function_kind sfk; bool abstract_ok; bool pack_expansion_p = false; + cp_token *declarator_id_start_token; /* Parse a declarator-id */ abstract_ok = (dcl_kind == CP_PARSER_DECLARATOR_EITHER); @@ -12931,6 +13042,7 @@ cp_parser_direct_declarator (cp_parser* parser, } } + declarator_id_start_token = cp_lexer_peek_token (parser->lexer); unqualified_name = cp_parser_declarator_id (parser, /*optional_p=*/abstract_ok); qualifying_scope = parser->scope; @@ -13000,7 +13112,8 @@ cp_parser_direct_declarator (cp_parser* parser, /*only_current_p=*/false); /* If that failed, the declarator is invalid. */ if (TREE_CODE (type) == TYPENAME_TYPE) - error ("%<%T::%E%> is not a type", + error ("%H%<%T::%E%> is not a type", + &declarator_id_start_token->location, TYPE_CONTEXT (qualifying_scope), TYPE_IDENTIFIER (qualifying_scope)); qualifying_scope = type; @@ -13026,7 +13139,8 @@ cp_parser_direct_declarator (cp_parser* parser, if (qualifying_scope && CLASSTYPE_USE_TEMPLATE (name_type)) { - error ("invalid use of constructor as a template"); + error ("%Hinvalid use of constructor as a template", + &declarator_id_start_token->location); inform ("use %<%T::%D%> instead of %<%T::%D%> to " "name the constructor in a qualified name", class_type, @@ -13185,6 +13299,7 @@ cp_parser_ptr_operator (cp_parser* parser, cp_parser_global_scope_opt (parser, /*current_scope_valid_p=*/false); /* Look for the nested-name specifier. */ + token = cp_lexer_peek_token (parser->lexer); cp_parser_nested_name_specifier (parser, /*typename_keyword_p=*/false, /*check_dependency_p=*/true, @@ -13199,7 +13314,7 @@ cp_parser_ptr_operator (cp_parser* parser, code = INDIRECT_REF; if (TREE_CODE (parser->scope) == NAMESPACE_DECL) - error ("%qD is a namespace", parser->scope); + error ("%H%qD is a namespace", &token->location, parser->scope); else { /* The type of which the member is a member is given by the @@ -13274,7 +13389,7 @@ cp_parser_cv_qualifier_seq_opt (cp_parser* parser) if (cv_quals & cv_qualifier) { - error ("duplicate cv-qualifier"); + error ("%Hduplicate cv-qualifier", &token->location); cp_lexer_purge_token (parser->lexer); } else @@ -13384,6 +13499,7 @@ cp_parser_type_specifier_seq (cp_parser* parser, { bool seen_type_specifier = false; cp_parser_flags flags = CP_PARSER_FLAGS_OPTIONAL; + cp_token *start_token = NULL; /* Clear the TYPE_SPECIFIER_SEQ. */ clear_decl_specs (type_specifier_seq); @@ -13403,6 +13519,11 @@ cp_parser_type_specifier_seq (cp_parser* parser, continue; } + /* record the token of the beginning of the type specifier seq, + for error reporting purposes*/ + if (!start_token) + start_token = cp_lexer_peek_token (parser->lexer); + /* Look for the type-specifier. */ type_specifier = cp_parser_type_specifier (parser, flags, @@ -13446,7 +13567,7 @@ cp_parser_type_specifier_seq (cp_parser* parser, flags |= CP_PARSER_FLAGS_NO_USER_DEFINED_TYPES; } - cp_parser_check_decl_spec (type_specifier_seq); + cp_parser_check_decl_spec (type_specifier_seq, start_token->location); } /* Parse a parameter-declaration-clause. @@ -13673,7 +13794,7 @@ cp_parser_parameter_declaration (cp_parser *parser, cp_decl_specifier_seq decl_specifiers; cp_declarator *declarator; tree default_argument; - cp_token *token; + cp_token *token = NULL, *declarator_token_start = NULL; const char *saved_message; /* In a template parameter, `>' is not an operator. @@ -13742,6 +13863,7 @@ cp_parser_parameter_declaration (cp_parser *parser, && cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_PAREN)) cp_parser_commit_to_tentative_parse (parser); /* Parse the declarator. */ + declarator_token_start = token; declarator = cp_parser_declarator (parser, CP_PARSER_DECLARATOR_EITHER, /*ctor_dtor_or_conv_p=*/NULL, @@ -13900,7 +14022,7 @@ cp_parser_parameter_declaration (cp_parser *parser, /* If we run out of tokens, issue an error message. */ case CPP_EOF: case CPP_PRAGMA_EOL: - error ("file ends in default argument"); + error ("%Hfile ends in default argument", &token->location); done = true; break; @@ -13937,8 +14059,11 @@ cp_parser_parameter_declaration (cp_parser *parser, /* Outside of a class definition, we can just parse the assignment-expression. */ else - default_argument - = cp_parser_default_argument (parser, template_parm_p); + { + token = cp_lexer_peek_token (parser->lexer); + default_argument + = cp_parser_default_argument (parser, template_parm_p); + } if (!parser->default_arg_ok_p) { @@ -13946,7 +14071,9 @@ cp_parser_parameter_declaration (cp_parser *parser, warning (0, "deprecated use of default argument for parameter of non-function"); else { - error ("default arguments are only permitted for function parameters"); + error ("%Hdefault arguments are only " + "permitted for function parameters", + &token->location); default_argument = NULL_TREE; } } @@ -13962,11 +14089,12 @@ cp_parser_parameter_declaration (cp_parser *parser, id_declarator = id_declarator->declarator; if (id_declarator && id_declarator->kind == cdk_id) - error ("%sparameter pack %qD cannot have a default argument", + error ("%H%sparameter pack %qD cannot have a default argument", + &declarator_token_start->location, kind, id_declarator->u.id.unqualified_name); else - error ("%sparameter pack cannot have a default argument", - kind); + error ("%H%sparameter pack cannot have a default argument", + &declarator_token_start->location, kind); default_argument = NULL_TREE; } @@ -14377,10 +14505,12 @@ cp_parser_class_name (cp_parser *parser, /*is_template=*/false, /*is_namespace=*/false, check_dependency_p, - &ambiguous_decls); + &ambiguous_decls, + identifier_token->location); if (ambiguous_decls) { - error ("reference to %qD is ambiguous", identifier); + error ("%Hreference to %qD is ambiguous", + &identifier_token->location, identifier); print_candidates (ambiguous_decls); if (cp_parser_parsing_tentatively (parser)) { @@ -14671,7 +14801,7 @@ cp_parser_class_head (cp_parser* parser, bool invalid_explicit_specialization_p = false; tree pushed_scope = NULL_TREE; unsigned num_templates; - + cp_token *type_start_token = NULL, *nested_name_specifier_token_start = NULL; /* Assume no nested-name-specifier will be present. */ *nested_name_specifier_p = false; /* Assume no template parameter lists will be used in defining the @@ -14704,6 +14834,7 @@ cp_parser_class_head (cp_parser* parser, /* Determine the name of the class. Begin by looking for an optional nested-name-specifier. */ + nested_name_specifier_token_start = cp_lexer_peek_token (parser->lexer); nested_name_specifier = cp_parser_nested_name_specifier_opt (parser, /*typename_keyword_p=*/false, @@ -14714,6 +14845,7 @@ cp_parser_class_head (cp_parser* parser, identifier. */ if (nested_name_specifier) { + type_start_token = cp_lexer_peek_token (parser->lexer); /* Although the grammar says `identifier', it really means `class-name' or `template-name'. You are only allowed to define a class that has already been declared with this @@ -14777,6 +14909,7 @@ cp_parser_class_head (cp_parser* parser, an identifier, or nothing at all. */ cp_parser_parse_tentatively (parser); /* Check for a template-id. */ + type_start_token = cp_lexer_peek_token (parser->lexer); id = cp_parser_template_id (parser, /*template_keyword_p=*/false, /*check_dependency_p=*/true, @@ -14828,7 +14961,8 @@ cp_parser_class_head (cp_parser* parser, /* Reject typedef-names in class heads. */ if (!DECL_IMPLICIT_TYPEDEF_P (type)) { - error ("invalid class name in declaration of %qD", type); + error ("%Hinvalid class name in declaration of %qD", + &type_start_token->location, type); type = NULL_TREE; goto done; } @@ -14840,10 +14974,13 @@ cp_parser_class_head (cp_parser* parser, if (scope && !is_ancestor (scope, nested_name_specifier)) { if (at_namespace_scope_p ()) - error ("declaration of %qD in namespace %qD which does not " - "enclose %qD", type, scope, nested_name_specifier); + error ("%Hdeclaration of %qD in namespace %qD which does not " + "enclose %qD", + &type_start_token->location, + type, scope, nested_name_specifier); else - error ("declaration of %qD in %qD which does not enclose %qD", + error ("%Hdeclaration of %qD in %qD which does not enclose %qD", + &type_start_token->location, type, scope, nested_name_specifier); type = NULL_TREE; goto done; @@ -14856,7 +14993,8 @@ cp_parser_class_head (cp_parser* parser, class member of a namespace outside of its namespace. */ if (scope == nested_name_specifier) { - permerror ("extra qualification not allowed"); + permerror ("%Hextra qualification not allowed", + &nested_name_specifier_token_start->location); nested_name_specifier = NULL_TREE; num_templates = 0; } @@ -14867,7 +15005,8 @@ cp_parser_class_head (cp_parser* parser, && parser->num_template_parameter_lists == 0 && template_id_p) { - error ("an explicit specialization must be preceded by %