diff options
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 791 |
1 files changed, 514 insertions, 277 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 2323c672166..567f04eea96 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,9 +1948,9 @@ 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); + (cp_decl_specifier_seq *, tree, location_t, bool); static bool cp_parser_friend_p (const cp_decl_specifier_seq *); static cp_token *cp_parser_require @@ -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,19 +1992,19 @@ 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 (cp_parser *); static void cp_parser_check_for_definition_in_return_type - (cp_declarator *, tree); + (cp_declarator *, tree, location_t type_location); static void cp_parser_check_for_invalid_template_id - (cp_parser *, tree); + (cp_parser *, tree, location_t location); 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 ("%<long long long%> is too long for GCC"); + error ("%H%<long long long%> 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 %<long long%>"); + pedwarn ("%HISO C++ 1998 does not support %<long long%>", + &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]); } } } @@ -2211,11 +2214,12 @@ cp_parser_check_type_definition (cp_parser* parser) /* This function is called when the DECLARATOR is processed. The TYPE was a type defined in the decl-specifiers. If it is invalid to define a type in the decl-specifiers for DECLARATOR, an error is - issued. */ + issued. TYPE_LOCATION is the location of TYPE and is used + for error reporting. */ static void cp_parser_check_for_definition_in_return_type (cp_declarator *declarator, - tree type) + tree type, location_t type_location) { /* [dcl.fct] forbids type definitions in return types. Unfortunately, it's not easy to know whether or not we are @@ -2228,31 +2232,32 @@ cp_parser_check_for_definition_in_return_type (cp_declarator *declarator, if (declarator && declarator->kind == cdk_function) { - error ("new types may not be defined in a return type"); - inform ("(perhaps a semicolon is missing after the definition of %qT)", - type); + error ("%Hnew types may not be defined in a return type", &type_location); + inform ("%H(perhaps a semicolon is missing after the definition of %qT)", + &type_location, type); } } /* A type-specifier (TYPE) has been parsed which cannot be followed by "<" in any valid C++ program. If the next token is indeed "<", issue a message warning the user about what appears to be an - invalid attempt to form a template-id. */ + invalid attempt to form a template-id. LOCATION is the location + of the type-specifier (TYPE) */ static void cp_parser_check_for_invalid_template_id (cp_parser* parser, - tree type) + tree type, location_t location) { cp_token_position start = 0; if (cp_lexer_next_token_is (parser->lexer, CPP_LESS)) { if (TYPE_P (type)) - error ("%qT is not a template", type); + error ("%H%qT is not a template", &location, type); else if (TREE_CODE (type) == IDENTIFIER_NODE) - error ("%qE is not a template", type); + error ("%H%qE is not a template", &location, type); else - error ("invalid template-id"); + error ("%Hinvalid template-id", &location); /* Remember the location of the invalid "<". */ if (cp_parser_uncommitted_to_tentative_parse_p (parser)) start = cp_lexer_token_position (parser->lexer, true); @@ -2298,30 +2303,34 @@ cp_parser_non_integral_constant_expression (cp_parser *parser, qualifying scope (or NULL, if none) for ID. This function commits to the current active tentative parse, if any. (Otherwise, the problematic construct might be encountered again later, resulting - in duplicate error messages.) */ + in duplicate error messages.) LOCATION is the location of ID. */ 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 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, 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. */ if (TREE_CODE (decl) == TEMPLATE_DECL) - error ("invalid use of template-name %qE without an argument list", decl); + error ("%Hinvalid use of template-name %qE without an argument list", + &location, decl); else if (TREE_CODE (id) == BIT_NOT_EXPR) - error ("invalid use of destructor %qD as a type", id); + error ("%Hinvalid use of destructor %qD as a type", &location, id); else if (TREE_CODE (decl) == TYPE_DECL) /* Something like 'unsigned A a;' */ - error ("invalid combination of multiple type-specifiers"); + error ("%Hinvalid combination of multiple type-specifiers", + &location); else if (!parser->scope) { /* Issue an error message. */ - error ("%qE does not name a type", id); + error ("%H%qE does not name a type", &location, id); /* If we're in a template class, it's possible that the user was referring to a type from a base class. For example: @@ -2353,8 +2362,8 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree scope, tree id) if (TREE_CODE (field) == TYPE_DECL && DECL_NAME (field) == id) { - inform ("(perhaps %<typename %T::%E%> was intended)", - BINFO_TYPE (b), id); + inform ("%H(perhaps %<typename %T::%E%> was intended)", + &location, BINFO_TYPE (b), id); break; } if (field) @@ -2368,10 +2377,11 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree scope, tree id) else if (parser->scope != error_mark_node) { if (TREE_CODE (parser->scope) == NAMESPACE_DECL) - error ("%qE in namespace %qE does not name a type", - id, parser->scope); + error ("%H%qE in namespace %qE does not name a type", + &location, id, parser->scope); else if (TYPE_P (parser->scope)) - error ("%qE in class %qT does not name a type", id, parser->scope); + error ("%H%qE in class %qT does not name a type", + &location, id, parser->scope); else gcc_unreachable (); } @@ -2392,6 +2402,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 +2426,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 +2715,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 +2724,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 +2942,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 +3122,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 +3220,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 +3232,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 +3291,8 @@ cp_parser_primary_expression (cp_parser *parser, cp_lexer_consume_token (parser->lexer); if (parser->local_variables_forbidden_p) { - error ("%<this%> may not be used in this context"); + error ("%H%<this%> may not be used in this context", + &token->location); return error_mark_node; } /* Pointers cannot appear in constant-expressions. */ @@ -3375,6 +3392,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 +3405,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 +3429,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 +3477,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 +3492,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 +3777,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 +3879,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 +3893,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 +4098,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; @@ -4725,6 +4750,9 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p, koenig_p, tf_warning_or_error); + if (warn_disallowed_functions) + warn_if_disallowed_function_p (postfix_expression); + /* The POSTFIX_EXPRESSION is certainly no longer an id. */ idk = CP_ID_KIND_NONE; } @@ -4743,7 +4771,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; @@ -4857,7 +4886,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; @@ -4889,7 +4919,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 @@ -4945,6 +4975,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, @@ -4972,7 +5003,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 @@ -5535,19 +5566,23 @@ 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"); - inform ("try removing the parentheses around the type-id"); + error ("%Harray bound forbidden after parenthesized type-id", + &token->location); + inform ("%Htry removing the parentheses around the type-id", + &token->location); cp_parser_direct_new_declarator (parser); } nelts = NULL_TREE; @@ -5724,6 +5759,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 @@ -5739,8 +5775,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; } } @@ -6481,6 +6517,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 @@ -6496,6 +6533,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, @@ -6503,10 +6541,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: @@ -6518,7 +6556,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: @@ -6880,7 +6919,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; @@ -6891,7 +6931,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: @@ -7009,7 +7049,7 @@ cp_parser_statement_seq_opt (cp_parser* parser, tree in_statement_expr) else { token = cp_lexer_consume_token (parser->lexer); - error ("%<else%> without a previous %<if%>"); + error ("%H%<else%> without a previous %<if%>", &token->location); } } @@ -7511,7 +7551,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) @@ -7519,10 +7559,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, "%<;%>"); @@ -7532,14 +7572,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 (); @@ -7576,7 +7616,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. */ @@ -7937,7 +7977,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)) @@ -8071,7 +8111,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 { @@ -8167,6 +8211,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); @@ -8183,6 +8228,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) { @@ -8259,15 +8309,17 @@ cp_parser_decl_specifier_seq (cp_parser* parser, we're complaining about C++0x compatibility. */ warning (OPT_Wc__0x_compat, - "%<auto%> will change meaning in C++0x; please remove it"); + "%H%<auto%> 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 %<auto%> specifier not supported"); + error ("%HC++0x %<auto%> specifier not supported", &token->location); break; case RID_REGISTER: @@ -8276,7 +8328,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. */ @@ -8312,7 +8365,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 @@ -8372,12 +8424,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. @@ -8433,7 +8486,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) @@ -8445,7 +8499,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 %<virtual%>"); + error ("%Htemplates may not be %<virtual%>", &token->location); else if (decl_specs) ++decl_specs->specs[(int) ds_virtual]; break; @@ -8599,6 +8653,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, "%<decltype%>")) @@ -8628,6 +8683,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, @@ -8650,7 +8706,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 @@ -8670,7 +8727,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 @@ -8913,17 +8971,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. */ @@ -8937,8 +8998,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; } @@ -8986,11 +9047,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 @@ -9041,11 +9104,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 %<typename%> not allowed in this context (a qualified " - "member initializer is implicitly a type)"); + error ("%Hkeyword %<typename%> 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. */ @@ -9562,6 +9628,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. */ @@ -9570,10 +9637,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); @@ -9667,10 +9735,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 (); @@ -9738,6 +9807,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, @@ -9758,7 +9830,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); @@ -9768,10 +9841,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 (); @@ -9820,7 +9896,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 @@ -9868,6 +9944,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, @@ -9894,6 +9971,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)) @@ -9908,15 +9986,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; } } @@ -9989,7 +10070,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 (); @@ -10043,6 +10125,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. */ @@ -10102,7 +10185,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. */ @@ -10146,7 +10230,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. */ @@ -10292,7 +10377,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 @@ -10339,6 +10424,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, @@ -10361,7 +10447,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"); @@ -10518,6 +10605,7 @@ cp_parser_explicit_instantiation (cp_parser* parser) int declares_class_or_enum; cp_decl_specifier_seq decl_specifiers; tree extension_specifier = NULL_TREE; + cp_token *token; /* Look for an (optional) storage-class-specifier or function-specifier. */ @@ -10540,6 +10628,7 @@ cp_parser_explicit_instantiation (cp_parser* parser) control while processing explicit instantiation directives. */ push_deferring_access_checks (dk_no_check); /* Parse a decl-specifier-seq. */ + token = cp_lexer_peek_token (parser->lexer); cp_parser_decl_specifier_seq (parser, CP_PARSER_FLAGS_OPTIONAL, &decl_specifiers, @@ -10572,7 +10661,8 @@ cp_parser_explicit_instantiation (cp_parser* parser) /*member_p=*/false); if (declares_class_or_enum & 2) cp_parser_check_for_definition_in_return_type (declarator, - decl_specifiers.type); + decl_specifiers.type, + decl_specifiers.type_location); if (declarator != cp_error_declarator) { decl = grokdeclarator (declarator, &decl_specifiers, @@ -10613,6 +10703,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, "%<template%>"); /* Look for the `<'. */ @@ -10627,7 +10719,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); @@ -10742,6 +10834,7 @@ cp_parser_type_specifier (cp_parser* parser, if (decl_specs) cp_parser_set_decl_spec_type (decl_specs, type_spec, + token->location, /*user_defined_p=*/true); return type_spec; } @@ -10766,6 +10859,7 @@ cp_parser_type_specifier (cp_parser* parser, if (decl_specs) cp_parser_set_decl_spec_type (decl_specs, type_spec, + token->location, /*user_defined_p=*/true); return type_spec; } @@ -10787,6 +10881,7 @@ cp_parser_type_specifier (cp_parser* parser, if (decl_specs) cp_parser_set_decl_spec_type (decl_specs, type_spec, + token->location, /*user_defined_p=*/true); return type_spec; @@ -10952,7 +11047,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 %<auto%> specifier not supported"); + error ("%HC++0x %<auto%> specifier not supported", &token->location); } break; @@ -10962,6 +11057,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, if (decl_specs) cp_parser_set_decl_spec_type (decl_specs, type, + token->location, /*user_defined_p=*/true); return type; @@ -10977,6 +11073,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, if (decl_specs) cp_parser_set_decl_spec_type (decl_specs, type, + token->location, /*user_defined_p=*/true); return type; @@ -10998,6 +11095,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, && token->keyword != RID_LONG)) cp_parser_set_decl_spec_type (decl_specs, type, + token->location, /*user_defined=*/false); if (decl_specs) decl_specs->any_specifiers_p = true; @@ -11008,7 +11106,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, /* There is no valid C++ program where a non-template type is followed by a "<". That usually indicates that the user thought that the type was a template. */ - cp_parser_check_for_invalid_template_id (parser, type); + cp_parser_check_for_invalid_template_id (parser, type, token->location); return TYPE_NAME (type); } @@ -11037,6 +11135,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, /*type_p=*/false, /*is_declaration=*/false) != NULL_TREE); + token = cp_lexer_peek_token (parser->lexer); /* If we have seen a nested-name-specifier, and the next token is `template', then we are using the template-id production. */ if (parser->scope @@ -11071,6 +11170,7 @@ cp_parser_simple_type_specifier (cp_parser* parser, type = NULL_TREE; if (type && decl_specs) cp_parser_set_decl_spec_type (decl_specs, type, + token->location, /*user_defined=*/true); } @@ -11103,7 +11203,8 @@ cp_parser_simple_type_specifier (cp_parser* parser, return qual_type; } - cp_parser_check_for_invalid_template_id (parser, TREE_TYPE (type)); + cp_parser_check_for_invalid_template_id (parser, TREE_TYPE (type), + token->location); } return type; @@ -11165,12 +11266,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))) @@ -11187,7 +11289,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 @@ -11236,6 +11338,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)) @@ -11305,6 +11408,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); @@ -11326,6 +11430,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) @@ -11338,7 +11443,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) { @@ -11350,7 +11456,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. */ @@ -11386,7 +11493,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; } @@ -11486,7 +11594,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); } @@ -11517,7 +11626,7 @@ cp_parser_elaborated_type_specifier (cp_parser* parser, /* A "<" cannot follow an elaborated type specifier. If that happens, the user was probably trying to form a template-id. */ - cp_parser_check_for_invalid_template_id (parser, type); + cp_parser_check_for_invalid_template_id (parser, type, token->location); return type; } @@ -11689,6 +11798,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) @@ -11717,13 +11828,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; } @@ -11838,6 +11950,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, "%<namespace%>"); /* Look for the identifier. */ @@ -11848,7 +11962,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 ("%<namespace%> definition is not allowed here"); + error ("%H%<namespace%> definition is not allowed here", &token->location); /* Skip the definition. */ cp_lexer_consume_token (parser->lexer); if (cp_parser_skip_to_closing_brace (parser)) @@ -11963,6 +12077,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, @@ -11987,7 +12102,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 ()) @@ -12003,9 +12119,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 ()) @@ -12255,7 +12375,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; @@ -12289,6 +12410,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, @@ -12303,12 +12425,14 @@ 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) cp_parser_check_for_definition_in_return_type (declarator, - decl_specifiers->type); + decl_specifiers->type, + decl_specifiers->type_location); /* Figure out what scope the entity declared by the DECLARATOR is located in. `grokdeclarator' sometimes changes the scope, so @@ -12320,8 +12444,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 @@ -12350,9 +12476,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; @@ -12478,6 +12607,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 @@ -12486,7 +12616,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, @@ -12888,7 +13019,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; } } @@ -12910,6 +13042,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); @@ -12928,6 +13061,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; @@ -12997,7 +13131,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; @@ -13023,7 +13158,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, @@ -13182,6 +13318,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, @@ -13196,7 +13333,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 @@ -13271,7 +13408,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 @@ -13381,6 +13518,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); @@ -13400,6 +13538,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, @@ -13443,7 +13586,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. @@ -13670,7 +13813,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. @@ -13739,6 +13882,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, @@ -13897,7 +14041,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; @@ -13934,8 +14078,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) { @@ -13943,7 +14090,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; } } @@ -13959,11 +14108,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; } @@ -14374,10 +14524,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)) { @@ -14668,7 +14820,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 @@ -14701,6 +14853,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, @@ -14711,6 +14864,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 @@ -14740,6 +14894,7 @@ cp_parser_class_head (cp_parser* parser, if (!cp_parser_parse_definitely (parser)) { invalid_nested_name_p = true; + type_start_token = cp_lexer_peek_token (parser->lexer); id = cp_parser_identifier (parser); if (id == error_mark_node) id = NULL_TREE; @@ -14774,6 +14929,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, @@ -14782,7 +14938,10 @@ cp_parser_class_head (cp_parser* parser, if (!cp_parser_parse_definitely (parser)) { if (cp_lexer_next_token_is (parser->lexer, CPP_NAME)) - id = cp_parser_identifier (parser); + { + type_start_token = cp_lexer_peek_token (parser->lexer); + id = cp_parser_identifier (parser); + } else id = NULL_TREE; } @@ -14796,7 +14955,8 @@ cp_parser_class_head (cp_parser* parser, pop_deferring_access_checks (); if (id) - cp_parser_check_for_invalid_template_id (parser, id); + cp_parser_check_for_invalid_template_id (parser, id, + type_start_token->location); /* If it's not a `:' or a `{' then we can't really be looking at a class-head, since a class-head only appears as part of a @@ -14825,7 +14985,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; } @@ -14837,10 +14998,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; @@ -14853,7 +15017,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; } @@ -14864,7 +15029,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 %<template <>%>"); + error ("%Han explicit specialization must be preceded by %<template <>%>", + &type_start_token->location); invalid_explicit_specialization_p = true; /* Take the same action that would have been taken by cp_parser_explicit_specialization. */ @@ -14876,7 +15042,8 @@ cp_parser_class_head (cp_parser* parser, use "goto done;" to return. */ /* Make sure that the right number of template parameters were present. */ - if (!cp_parser_check_template_parameters (parser, num_templates)) + if (!cp_parser_check_template_parameters (parser, num_templates, + type_start_token->location)) { /* If something went wrong, there is no point in even trying to process the class-definition. */ @@ -14891,7 +15058,8 @@ cp_parser_class_head (cp_parser* parser, && (DECL_FUNCTION_TEMPLATE_P (TREE_OPERAND (id, 0)) || TREE_CODE (TREE_OPERAND (id, 0)) == OVERLOAD)) { - error ("function template %qD redeclared as a class template", id); + error ("%Hfunction template %qD redeclared as a class template", + &type_start_token->location, id); type = error_mark_node; } else @@ -14972,8 +15140,10 @@ cp_parser_class_head (cp_parser* parser, that's an error. */ if (type != error_mark_node && COMPLETE_TYPE_P (type)) { - error ("redefinition of %q#T", type); - error ("previous definition of %q+#T", type); + error ("%Hredefinition of %q#T", + &type_start_token->location, type); + error ("%Hprevious definition of %q+#T", + &type_start_token->location, type); type = NULL_TREE; goto done; } @@ -15128,7 +15298,9 @@ cp_parser_member_declaration (cp_parser* parser) tree decl; int declares_class_or_enum; bool friend_p; - cp_token *token; + cp_token *token = NULL; + cp_token *decl_spec_token_start = NULL; + cp_token *initializer_token_start = NULL; int saved_pedantic; /* Check for the `__extension__' keyword. */ @@ -15192,6 +15364,7 @@ cp_parser_member_declaration (cp_parser* parser) return; /* Parse the decl-specifier-seq. */ + decl_spec_token_start = cp_lexer_peek_token (parser->lexer); cp_parser_decl_specifier_seq (parser, CP_PARSER_FLAGS_OPTIONAL, &decl_specifiers, @@ -15237,7 +15410,8 @@ cp_parser_member_declaration (cp_parser* parser) /* If the `friend' keyword was present, the friend must be introduced with a class-key. */ if (!declares_class_or_enum) - error ("a class-key must be used when declaring a friend"); + error ("%Ha class-key must be used when declaring a friend", + &decl_spec_token_start->location); /* In this case: template <typename T> struct A { @@ -15251,8 +15425,8 @@ cp_parser_member_declaration (cp_parser* parser) && TYPE_P (decl_specifiers.type)) type = decl_specifiers.type; if (!type || !TYPE_P (type)) - error ("friend declaration does not name a class or " - "function"); + error ("%Hfriend declaration does not name a class or " + "function", &decl_spec_token_start->location); else make_friend_class (current_class_type, type, /*complain=*/true); @@ -15275,7 +15449,9 @@ cp_parser_member_declaration (cp_parser* parser) finish_member_declaration (decl); } else - cp_parser_check_access_in_redeclaration (TYPE_NAME (type)); + cp_parser_check_access_in_redeclaration + (TYPE_NAME (type), + decl_spec_token_start->location); } } else @@ -15369,7 +15545,8 @@ cp_parser_member_declaration (cp_parser* parser) if (declares_class_or_enum & 2) cp_parser_check_for_definition_in_return_type - (declarator, decl_specifiers.type); + (declarator, decl_specifiers.type, + decl_specifiers.type_location); /* Look for an asm-specification. */ asm_specification = cp_parser_asm_specification_opt (parser); @@ -15403,6 +15580,7 @@ cp_parser_member_declaration (cp_parser* parser) for a pure-specifier; otherwise, we look for a constant-initializer. When we call `grokfield', it will perform more stringent semantics checks. */ + initializer_token_start = cp_lexer_peek_token (parser->lexer); if (function_declarator_p (declarator)) initializer = cp_parser_pure_specifier (parser); else @@ -15427,7 +15605,8 @@ cp_parser_member_declaration (cp_parser* parser) standard, since a pure function may be defined outside of the class-specifier. */ if (initializer) - error ("pure-specifier on function-definition"); + error ("%Hpure-specifier on function-definition", + &initializer_token_start->location); decl = cp_parser_save_member_function_body (parser, &decl_specifiers, declarator, @@ -15518,7 +15697,7 @@ cp_parser_pure_specifier (cp_parser* parser) } if (PROCESSING_REAL_TEMPLATE_DECL_P ()) { - error ("templates may not be %<virtual%>"); + error ("%Htemplates may not be %<virtual%>", &token->location); return error_mark_node; } @@ -15720,11 +15899,14 @@ cp_parser_base_specifier (cp_parser* parser) as base classes. */ if (cp_lexer_next_token_is_keyword (parser->lexer, RID_TYPENAME)) { + token = cp_lexer_peek_token (parser->lexer); if (!processing_template_decl) - error ("keyword %<typename%> not allowed outside of templates"); + error ("%Hkeyword %<typename%> not allowed outside of templates", + &token->location); else - error ("keyword %<typename%> not allowed in this context " - "(the base class is implicitly a type)"); + error ("%Hkeyword %<typename%> not allowed in this context " + "(the base class is implicitly a type)", + &token->location); cp_lexer_consume_token (parser->lexer); } @@ -16425,7 +16607,8 @@ cp_parser_lookup_name (cp_parser *parser, tree name, bool is_template, bool is_namespace, bool check_dependency, - tree *ambiguous_decls) + tree *ambiguous_decls, + location_t name_location) { int flags = 0; tree decl; @@ -16606,7 +16789,8 @@ cp_parser_lookup_name (cp_parser *parser, tree name, cp_parser_error, so we incorporate its actions directly. */ if (!cp_parser_simulate_error (parser)) { - error ("reference to %qD is ambiguous", name); + error ("%Hreference to %qD is ambiguous", + &name_location, name); print_candidates (decl); } return error_mark_node; @@ -16636,14 +16820,15 @@ cp_parser_lookup_name (cp_parser *parser, tree name, IS_NAMESPACE is FALSE, and CHECK_DEPENDENCY is TRUE. */ static tree -cp_parser_lookup_name_simple (cp_parser* parser, tree name) +cp_parser_lookup_name_simple (cp_parser* parser, tree name, location_t location) { return cp_parser_lookup_name (parser, name, none_type, /*is_template=*/false, /*is_namespace=*/false, /*check_dependency=*/true, - /*ambiguous_decls=*/NULL); + /*ambiguous_decls=*/NULL, + location); } /* If DECL is a TEMPLATE_DECL that can be treated like a TYPE_DECL in @@ -16696,7 +16881,8 @@ cp_parser_maybe_treat_template_as_class (tree decl, bool tag_name_p) static bool cp_parser_check_declarator_template_parameters (cp_parser* parser, - cp_declarator *declarator) + cp_declarator *declarator, + location_t declarator_location) { unsigned num_templates; @@ -16746,7 +16932,8 @@ cp_parser_check_declarator_template_parameters (cp_parser* parser, ++num_templates; return cp_parser_check_template_parameters (parser, - num_templates); + num_templates, + declarator_location); case cdk_function: case cdk_array: @@ -16754,7 +16941,7 @@ cp_parser_check_declarator_template_parameters (cp_parser* parser, case cdk_reference: case cdk_ptrmem: return (cp_parser_check_declarator_template_parameters - (parser, declarator->declarator)); + (parser, declarator->declarator, declarator_location)); case cdk_error: return true; @@ -16771,7 +16958,8 @@ cp_parser_check_declarator_template_parameters (cp_parser* parser, static bool cp_parser_check_template_parameters (cp_parser* parser, - unsigned num_templates) + unsigned num_templates, + location_t location) { /* If there are more template classes than parameter lists, we have something like: @@ -16779,7 +16967,7 @@ cp_parser_check_template_parameters (cp_parser* parser, template <class T> void S<T>::R<T>::f (); */ if (parser->num_template_parameter_lists < num_templates) { - error ("too few template-parameter-lists"); + error ("%Htoo few template-parameter-lists", &location); return false; } /* If there are the same number of template classes and parameter @@ -16794,7 +16982,7 @@ cp_parser_check_template_parameters (cp_parser* parser, something like: template <class T> template <class U> void S::f(); */ - error ("too many template-parameter-lists"); + error ("%Htoo many template-parameter-lists", &location); return false; } @@ -17052,12 +17240,14 @@ cp_parser_function_definition_after_declarator (cp_parser* parser, bool saved_in_unbraced_linkage_specification_p; bool saved_in_function_body; unsigned saved_num_template_parameter_lists; + cp_token *token; saved_in_function_body = parser->in_function_body; parser->in_function_body = true; /* If the next token is `return', then the code may be trying to make use of the "named return value" extension that G++ used to support. */ + token = cp_lexer_peek_token (parser->lexer); if (cp_lexer_next_token_is_keyword (parser->lexer, RID_RETURN)) { /* Consume the `return' keyword. */ @@ -17066,7 +17256,8 @@ cp_parser_function_definition_after_declarator (cp_parser* parser, returned. */ cp_parser_identifier (parser); /* Issue an error message. */ - error ("named return values are no longer supported"); + error ("%Hnamed return values are no longer supported", + &token->location); /* Skip tokens until we reach the start of the function body. */ while (true) { @@ -17125,8 +17316,10 @@ cp_parser_template_declaration_after_export (cp_parser* parser, bool member_p) tree parameter_list; bool friend_p = false; bool need_lang_pop; + cp_token *token; /* Look for the `template' keyword. */ + token = cp_lexer_peek_token (parser->lexer); if (!cp_parser_require_keyword (parser, RID_TEMPLATE, "%<template%>")) return; @@ -17138,7 +17331,8 @@ cp_parser_template_declaration_after_export (cp_parser* parser, bool member_p) /* 14.5.2.2 [temp.mem] A local class shall not have member templates. */ - error ("invalid declaration of member template in local class"); + error ("%Hinvalid declaration of member template in local class", + &token->location); cp_parser_skip_to_end_of_block_or_statement (parser); return; } @@ -17147,7 +17341,7 @@ cp_parser_template_declaration_after_export (cp_parser* parser, bool member_p) A template ... shall not have C linkage. */ if (current_lang_name == lang_name_c) { - error ("template with C linkage"); + error ("%Htemplate with C linkage", &token->location); /* Give it C++ linkage to avoid confusing other parts of the front end. */ push_lang_context (lang_name_cplusplus); @@ -17194,6 +17388,7 @@ cp_parser_template_declaration_after_export (cp_parser* parser, bool member_p) /* There are no access checks when parsing a template, as we do not know if a specialization will be a friend. */ push_deferring_access_checks (dk_no_check); + token = cp_lexer_peek_token (parser->lexer); decl = cp_parser_single_declaration (parser, checks, member_p, @@ -17206,7 +17401,7 @@ cp_parser_template_declaration_after_export (cp_parser* parser, bool member_p) if (member_p && !friend_p && decl) { if (TREE_CODE (decl) == TYPE_DECL) - cp_parser_check_access_in_redeclaration (decl); + cp_parser_check_access_in_redeclaration (decl, token->location); decl = finish_member_template_decl (decl); } @@ -17270,6 +17465,7 @@ cp_parser_single_declaration (cp_parser* parser, tree decl = NULL_TREE; cp_decl_specifier_seq decl_specifiers; bool function_definition_p = false; + cp_token *decl_spec_token_start; /* This function is only used when processing a template declaration. */ @@ -17281,6 +17477,7 @@ cp_parser_single_declaration (cp_parser* parser, /* Try the `decl-specifier-seq [opt] init-declarator [opt]' alternative. */ + decl_spec_token_start = cp_lexer_peek_token (parser->lexer); cp_parser_decl_specifier_seq (parser, CP_PARSER_FLAGS_OPTIONAL, &decl_specifiers, @@ -17291,7 +17488,8 @@ cp_parser_single_declaration (cp_parser* parser, /* There are no template typedefs. */ if (decl_specifiers.specs[(int) ds_typedef]) { - error ("template declaration of %qs", "typedef"); + error ("%Htemplate declaration of %qs", + &decl_spec_token_start->location, "typedef"); decl = error_mark_node; } @@ -17354,7 +17552,8 @@ cp_parser_single_declaration (cp_parser* parser, && explicit_specialization_p && decl_specifiers.storage_class != sc_none) { - error ("explicit template specialization cannot have a storage class"); + error ("%Hexplicit template specialization cannot have a storage class", + &decl_spec_token_start->location); decl = error_mark_node; } } @@ -17583,9 +17782,9 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser) is a typo for '>'. Emit an error message and continue. Same deal about the token location, but here we can get it right by consuming the '>>' before issuing the diagnostic. */ - cp_lexer_consume_token (parser->lexer); - error ("spurious %<>>%>, use %<>%> to terminate " - "a template argument list"); + cp_token *token = cp_lexer_consume_token (parser->lexer); + error ("%Hspurious %<>>%>, use %<>%> to terminate " + "a template argument list", &token->location); } } else @@ -17906,14 +18105,15 @@ cp_parser_declares_only_class_p (cp_parser *parser) static void cp_parser_set_storage_class (cp_parser *parser, cp_decl_specifier_seq *decl_specs, - enum rid keyword) + enum rid keyword, + location_t location) { cp_storage_class storage_class; if (parser->in_unbraced_linkage_specification_p) { - error ("invalid use of %qD in linkage specification", - ridpointers[keyword]); + error ("%Hinvalid use of %qD in linkage specification", + &location, ridpointers[keyword]); return; } else if (decl_specs->storage_class != sc_none) @@ -17925,7 +18125,7 @@ cp_parser_set_storage_class (cp_parser *parser, if ((keyword == RID_EXTERN || keyword == RID_STATIC) && decl_specs->specs[(int) ds_thread]) { - error ("%<__thread%> before %qD", ridpointers[keyword]); + error ("%H%<__thread%> before %qD", &location, ridpointers[keyword]); decl_specs->specs[(int) ds_thread] = 0; } @@ -17966,6 +18166,7 @@ cp_parser_set_storage_class (cp_parser *parser, static void cp_parser_set_decl_spec_type (cp_decl_specifier_seq *decl_specs, tree type_spec, + location_t location, bool user_defined_p) { decl_specs->any_specifiers_p = true; @@ -17992,6 +18193,7 @@ cp_parser_set_decl_spec_type (cp_decl_specifier_seq *decl_specs, { decl_specs->type = type_spec; decl_specs->user_defined_type_p = false; + decl_specs->type_location = location; } } else if (decl_specs->type) @@ -18001,6 +18203,7 @@ cp_parser_set_decl_spec_type (cp_decl_specifier_seq *decl_specs, decl_specs->type = type_spec; decl_specs->user_defined_type_p = user_defined_p; decl_specs->redefined_builtin_type = NULL_TREE; + decl_specs->type_location = location; } } @@ -18255,7 +18458,7 @@ cp_parser_check_class_key (enum tag_types class_key, tree type) [class.mem/1]. */ static void -cp_parser_check_access_in_redeclaration (tree decl) +cp_parser_check_access_in_redeclaration (tree decl, location_t location) { if (!decl || !CLASS_TYPE_P (TREE_TYPE (decl))) return; @@ -18264,7 +18467,7 @@ cp_parser_check_access_in_redeclaration (tree decl) != (current_access_specifier == access_private_node)) || (TREE_PROTECTED (decl) != (current_access_specifier == access_protected_node))) - error ("%qD redeclared with different access", decl); + error ("%H%qD redeclared with different access", &location, decl); } /* Look for the `template' keyword, as a syntactic disambiguator. @@ -18281,8 +18484,9 @@ cp_parser_optional_template_keyword (cp_parser *parser) template and what is not. */ if (!processing_template_decl) { - error ("%<template%> (as a disambiguator) is only allowed " - "within templates"); + cp_token *token = cp_lexer_peek_token (parser->lexer); + error ("%H%<template%> (as a disambiguator) is only allowed " + "within templates", &token->location); /* If this part of the token stream is rescanned, the same error message would be generated. So, we purge the token from the stream. */ @@ -18547,7 +18751,8 @@ cp_parser_objc_expression (cp_parser* parser) break; } default: - error ("misplaced %<@%D%> Objective-C++ construct", kwd->u.value); + error ("%Hmisplaced %<@%D%> Objective-C++ construct", + &kwd->location, kwd->u.value); cp_parser_skip_to_end_of_block_or_statement (parser); } @@ -18680,15 +18885,18 @@ static tree cp_parser_objc_encode_expression (cp_parser* parser) { tree type; + cp_token *token; cp_lexer_consume_token (parser->lexer); /* Eat '@encode'. */ cp_parser_require (parser, CPP_OPEN_PAREN, "%<(%>"); + token = cp_lexer_peek_token (parser->lexer); type = complete_type (cp_parser_type_id (parser)); cp_parser_require (parser, CPP_CLOSE_PAREN, "%<)%>"); if (!type) { - error ("%<@encode%> must specify a type as an argument"); + error ("%H%<@encode%> must specify a type as an argument", + &token->location); return error_mark_node; } @@ -19003,7 +19211,7 @@ cp_parser_objc_selector (cp_parser* parser) if (!cp_parser_objc_selector_p (token->type)) { - error ("invalid Objective-C++ selector name"); + error ("%Hinvalid Objective-C++ selector name", &token->location); return error_mark_node; } @@ -19333,7 +19541,8 @@ cp_parser_objc_protocol_declaration (cp_parser* parser) cp_lexer_consume_token (parser->lexer); /* Eat '@protocol'. */ if (cp_lexer_next_token_is_not (parser->lexer, CPP_NAME)) { - error ("identifier expected after %<@protocol%>"); + tok = cp_lexer_peek_token (parser->lexer); + error ("%Hidentifier expected after %<@protocol%>", &tok->location); goto finish; } @@ -19469,7 +19678,8 @@ cp_parser_objc_declaration (cp_parser* parser) cp_parser_objc_end_implementation (parser); break; default: - error ("misplaced %<@%D%> Objective-C++ construct", kwd->u.value); + error ("%Hmisplaced %<@%D%> Objective-C++ construct", + &kwd->location, kwd->u.value); cp_parser_skip_to_end_of_block_or_statement (parser); } } @@ -19600,7 +19810,8 @@ cp_parser_objc_statement (cp_parser * parser) { case RID_AT_THROW: return cp_parser_objc_throw_statement (parser); default: - error ("misplaced %<@%D%> Objective-C++ construct", kwd->u.value); + error ("%Hmisplaced %<@%D%> Objective-C++ construct", + &kwd->location, kwd->u.value); cp_parser_skip_to_end_of_block_or_statement (parser); } @@ -19684,14 +19895,15 @@ cp_parser_omp_clause_name (cp_parser *parser) /* Validate that a clause of the given type does not already exist. */ static void -check_no_duplicate_clause (tree clauses, enum tree_code code, const char *name) +check_no_duplicate_clause (tree clauses, enum tree_code code, + const char *name, location_t location) { tree c; for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c)) if (OMP_CLAUSE_CODE (c) == code) { - error ("too many %qs clauses", name); + error ("%Htoo many %qs clauses", &location, name); break; } } @@ -19714,10 +19926,12 @@ static tree cp_parser_omp_var_list_no_open (cp_parser *parser, enum omp_clause_code kind, tree list) { + cp_token *token; while (1) { tree name, decl; + token = cp_lexer_peek_token (parser->lexer); name = cp_parser_id_expression (parser, /*template_p=*/false, /*check_dependency_p=*/true, /*template_p=*/NULL, @@ -19726,9 +19940,9 @@ cp_parser_omp_var_list_no_open (cp_parser *parser, enum omp_clause_code kind, if (name == error_mark_node) goto skip_comma; - decl = cp_parser_lookup_name_simple (parser, name); + decl = cp_parser_lookup_name_simple (parser, name, token->location); if (decl == error_mark_node) - cp_parser_name_lookup_error (parser, name, decl, NULL); + cp_parser_name_lookup_error (parser, name, decl, NULL, token->location); else if (kind != 0) { tree u = build_omp_clause (kind); @@ -19778,7 +19992,7 @@ cp_parser_omp_var_list (cp_parser *parser, enum omp_clause_code kind, tree list) collapse ( constant-expression ) */ static tree -cp_parser_omp_clause_collapse (cp_parser *parser, tree list) +cp_parser_omp_clause_collapse (cp_parser *parser, tree list, location_t location) { tree c, num; location_t loc; @@ -19803,11 +20017,12 @@ cp_parser_omp_clause_collapse (cp_parser *parser, tree list) || (n = tree_low_cst (num, 0)) <= 0 || (int) n != n) { - error ("%Hcollapse argument needs positive constant integer expression", &loc); + error ("%Hcollapse argument needs positive constant integer expression", + &loc); return list; } - check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse"); + check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse", location); c = build_omp_clause (OMP_CLAUSE_COLLAPSE); OMP_CLAUSE_CHAIN (c) = list; OMP_CLAUSE_COLLAPSE_EXPR (c) = num; @@ -19819,7 +20034,7 @@ cp_parser_omp_clause_collapse (cp_parser *parser, tree list) default ( shared | none ) */ static tree -cp_parser_omp_clause_default (cp_parser *parser, tree list) +cp_parser_omp_clause_default (cp_parser *parser, tree list, location_t location) { enum omp_clause_default_kind kind = OMP_CLAUSE_DEFAULT_UNSPECIFIED; tree c; @@ -19865,7 +20080,7 @@ cp_parser_omp_clause_default (cp_parser *parser, tree list) if (kind == OMP_CLAUSE_DEFAULT_UNSPECIFIED) return list; - check_no_duplicate_clause (list, OMP_CLAUSE_DEFAULT, "default"); + check_no_duplicate_clause (list, OMP_CLAUSE_DEFAULT, "default", location); c = build_omp_clause (OMP_CLAUSE_DEFAULT); OMP_CLAUSE_CHAIN (c) = list; OMP_CLAUSE_DEFAULT_KIND (c) = kind; @@ -19877,7 +20092,7 @@ cp_parser_omp_clause_default (cp_parser *parser, tree list) if ( expression ) */ static tree -cp_parser_omp_clause_if (cp_parser *parser, tree list) +cp_parser_omp_clause_if (cp_parser *parser, tree list, location_t location) { tree t, c; @@ -19892,7 +20107,7 @@ cp_parser_omp_clause_if (cp_parser *parser, tree list) /*or_comma=*/false, /*consume_paren=*/true); - check_no_duplicate_clause (list, OMP_CLAUSE_IF, "if"); + check_no_duplicate_clause (list, OMP_CLAUSE_IF, "if", location); c = build_omp_clause (OMP_CLAUSE_IF); OMP_CLAUSE_IF_EXPR (c) = t; @@ -19905,11 +20120,12 @@ cp_parser_omp_clause_if (cp_parser *parser, tree list) nowait */ static tree -cp_parser_omp_clause_nowait (cp_parser *parser ATTRIBUTE_UNUSED, tree list) +cp_parser_omp_clause_nowait (cp_parser *parser ATTRIBUTE_UNUSED, + tree list, location_t location) { tree c; - check_no_duplicate_clause (list, OMP_CLAUSE_NOWAIT, "nowait"); + check_no_duplicate_clause (list, OMP_CLAUSE_NOWAIT, "nowait", location); c = build_omp_clause (OMP_CLAUSE_NOWAIT); OMP_CLAUSE_CHAIN (c) = list; @@ -19920,7 +20136,8 @@ cp_parser_omp_clause_nowait (cp_parser *parser ATTRIBUTE_UNUSED, tree list) num_threads ( expression ) */ static tree -cp_parser_omp_clause_num_threads (cp_parser *parser, tree list) +cp_parser_omp_clause_num_threads (cp_parser *parser, tree list, + location_t location) { tree t, c; @@ -19935,7 +20152,8 @@ cp_parser_omp_clause_num_threads (cp_parser *parser, tree list) /*or_comma=*/false, /*consume_paren=*/true); - check_no_duplicate_clause (list, OMP_CLAUSE_NUM_THREADS, "num_threads"); + check_no_duplicate_clause (list, OMP_CLAUSE_NUM_THREADS, + "num_threads", location); c = build_omp_clause (OMP_CLAUSE_NUM_THREADS); OMP_CLAUSE_NUM_THREADS_EXPR (c) = t; @@ -19948,11 +20166,13 @@ cp_parser_omp_clause_num_threads (cp_parser *parser, tree list) ordered */ static tree -cp_parser_omp_clause_ordered (cp_parser *parser ATTRIBUTE_UNUSED, tree list) +cp_parser_omp_clause_ordered (cp_parser *parser ATTRIBUTE_UNUSED, + tree list, location_t location) { tree c; - check_no_duplicate_clause (list, OMP_CLAUSE_ORDERED, "ordered"); + check_no_duplicate_clause (list, OMP_CLAUSE_ORDERED, + "ordered", location); c = build_omp_clause (OMP_CLAUSE_ORDERED); OMP_CLAUSE_CHAIN (c) = list; @@ -20029,7 +20249,7 @@ cp_parser_omp_clause_reduction (cp_parser *parser, tree list) static | dynamic | guided | runtime | auto */ static tree -cp_parser_omp_clause_schedule (cp_parser *parser, tree list) +cp_parser_omp_clause_schedule (cp_parser *parser, tree list, location_t location) { tree c, t; @@ -20077,18 +20297,20 @@ cp_parser_omp_clause_schedule (cp_parser *parser, tree list) if (cp_lexer_next_token_is (parser->lexer, CPP_COMMA)) { + cp_token *token; cp_lexer_consume_token (parser->lexer); + token = cp_lexer_peek_token (parser->lexer); t = cp_parser_assignment_expression (parser, false); if (t == error_mark_node) goto resync_fail; else if (OMP_CLAUSE_SCHEDULE_KIND (c) == OMP_CLAUSE_SCHEDULE_RUNTIME) - error ("schedule %<runtime%> does not take " - "a %<chunk_size%> parameter"); + error ("%Hschedule %<runtime%> does not take " + "a %<chunk_size%> parameter", &token->location); else if (OMP_CLAUSE_SCHEDULE_KIND (c) == OMP_CLAUSE_SCHEDULE_AUTO) - error ("schedule %<auto%> does not take " - "a %<chunk_size%> parameter"); + error ("%Hschedule %<auto%> does not take " + "a %<chunk_size%> parameter", &token->location); else OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (c) = t; @@ -20098,7 +20320,7 @@ cp_parser_omp_clause_schedule (cp_parser *parser, tree list) else if (!cp_parser_require (parser, CPP_CLOSE_PAREN, "%<,%> or %<)%>")) goto resync_fail; - check_no_duplicate_clause (list, OMP_CLAUSE_SCHEDULE, "schedule"); + check_no_duplicate_clause (list, OMP_CLAUSE_SCHEDULE, "schedule", location); OMP_CLAUSE_CHAIN (c) = list; return c; @@ -20115,11 +20337,12 @@ cp_parser_omp_clause_schedule (cp_parser *parser, tree list) untied */ static tree -cp_parser_omp_clause_untied (cp_parser *parser ATTRIBUTE_UNUSED, tree list) +cp_parser_omp_clause_untied (cp_parser *parser ATTRIBUTE_UNUSED, + tree list, location_t location) { tree c; - check_no_duplicate_clause (list, OMP_CLAUSE_UNTIED, "untied"); + check_no_duplicate_clause (list, OMP_CLAUSE_UNTIED, "untied", location); c = build_omp_clause (OMP_CLAUSE_UNTIED); OMP_CLAUSE_CHAIN (c) = list; @@ -20136,6 +20359,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, { tree clauses = NULL; bool first = true; + cp_token *token = NULL; while (cp_lexer_next_token_is_not (parser->lexer, CPP_PRAGMA_EOL)) { @@ -20146,13 +20370,15 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, if (!first && cp_lexer_next_token_is (parser->lexer, CPP_COMMA)) cp_lexer_consume_token (parser->lexer); + token = cp_lexer_peek_token (parser->lexer); c_kind = cp_parser_omp_clause_name (parser); first = false; switch (c_kind) { case PRAGMA_OMP_CLAUSE_COLLAPSE: - clauses = cp_parser_omp_clause_collapse (parser, clauses); + clauses = cp_parser_omp_clause_collapse (parser, clauses, + token->location); c_name = "collapse"; break; case PRAGMA_OMP_CLAUSE_COPYIN: @@ -20165,7 +20391,8 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, c_name = "copyprivate"; break; case PRAGMA_OMP_CLAUSE_DEFAULT: - clauses = cp_parser_omp_clause_default (parser, clauses); + clauses = cp_parser_omp_clause_default (parser, clauses, + token->location); c_name = "default"; break; case PRAGMA_OMP_CLAUSE_FIRSTPRIVATE: @@ -20174,7 +20401,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, c_name = "firstprivate"; break; case PRAGMA_OMP_CLAUSE_IF: - clauses = cp_parser_omp_clause_if (parser, clauses); + clauses = cp_parser_omp_clause_if (parser, clauses, token->location); c_name = "if"; break; case PRAGMA_OMP_CLAUSE_LASTPRIVATE: @@ -20183,15 +20410,17 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, c_name = "lastprivate"; break; case PRAGMA_OMP_CLAUSE_NOWAIT: - clauses = cp_parser_omp_clause_nowait (parser, clauses); + clauses = cp_parser_omp_clause_nowait (parser, clauses, token->location); c_name = "nowait"; break; case PRAGMA_OMP_CLAUSE_NUM_THREADS: - clauses = cp_parser_omp_clause_num_threads (parser, clauses); + clauses = cp_parser_omp_clause_num_threads (parser, clauses, + token->location); c_name = "num_threads"; break; case PRAGMA_OMP_CLAUSE_ORDERED: - clauses = cp_parser_omp_clause_ordered (parser, clauses); + clauses = cp_parser_omp_clause_ordered (parser, clauses, + token->location); c_name = "ordered"; break; case PRAGMA_OMP_CLAUSE_PRIVATE: @@ -20204,7 +20433,8 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, c_name = "reduction"; break; case PRAGMA_OMP_CLAUSE_SCHEDULE: - clauses = cp_parser_omp_clause_schedule (parser, clauses); + clauses = cp_parser_omp_clause_schedule (parser, clauses, + token->location); c_name = "schedule"; break; case PRAGMA_OMP_CLAUSE_SHARED: @@ -20213,7 +20443,8 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, c_name = "shared"; break; case PRAGMA_OMP_CLAUSE_UNTIED: - clauses = cp_parser_omp_clause_untied (parser, clauses); + clauses = cp_parser_omp_clause_untied (parser, clauses, + token->location); c_name = "nowait"; break; default: @@ -20226,7 +20457,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, unsigned int mask, /* Remove the invalid clause(s) from the list to avoid confusing the rest of the compiler. */ clauses = prev; - error ("%qs is not valid for %qs", c_name, where); + error ("%H%qs is not valid for %qs", &token->location, c_name, where); } } saw_error: @@ -20902,7 +21133,10 @@ cp_parser_omp_for_loop (cp_parser *parser, tree clauses, tree *par_clauses) else { if (!collapse_err) - error ("collapsed loops not perfectly nested"); + { + location_t loc = cp_lexer_peek_token (parser->lexer)->location; + error ("%Hcollapsed loops not perfectly nested", &loc); + } collapse_err = true; cp_parser_statement_seq_opt (parser, NULL); cp_parser_require (parser, CPP_CLOSE_BRACE, "%<}%>"); @@ -21312,10 +21546,11 @@ cp_parser_initial_pragma (cp_token *first_token) cp_lexer_get_preprocessor_token (NULL, first_token); if (first_token->type != CPP_PRAGMA_EOL) - error ("junk at end of %<#pragma GCC pch_preprocess%>"); + error ("%Hjunk at end of %<#pragma GCC pch_preprocess%>", + &first_token->location); } else - error ("expected string literal"); + error ("%Hexpected string literal", &first_token->location); /* Skip to the end of the pragma. */ while (first_token->type != CPP_PRAGMA_EOL && first_token->type != CPP_EOF) @@ -21348,7 +21583,8 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) switch (id) { case PRAGMA_GCC_PCH_PREPROCESS: - error ("%<#pragma GCC pch_preprocess%> must be first"); + error ("%H%<#pragma GCC pch_preprocess%> must be first", + &pragma_tok->location); break; case PRAGMA_OMP_BARRIER: @@ -21358,8 +21594,8 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) cp_parser_omp_barrier (parser, pragma_tok); return false; case pragma_stmt: - error ("%<#pragma omp barrier%> may only be " - "used in compound statements"); + error ("%H%<#pragma omp barrier%> may only be " + "used in compound statements", &pragma_tok->location); break; default: goto bad_stmt; @@ -21373,8 +21609,8 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) cp_parser_omp_flush (parser, pragma_tok); return false; case pragma_stmt: - error ("%<#pragma omp flush%> may only be " - "used in compound statements"); + error ("%H%<#pragma omp flush%> may only be " + "used in compound statements", &pragma_tok->location); break; default: goto bad_stmt; @@ -21388,8 +21624,9 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) cp_parser_omp_taskwait (parser, pragma_tok); return false; case pragma_stmt: - error ("%<#pragma omp taskwait%> may only be " - "used in compound statements"); + error ("%H%<#pragma omp taskwait%> may only be " + "used in compound statements", + &pragma_tok->location); break; default: goto bad_stmt; @@ -21415,8 +21652,8 @@ cp_parser_pragma (cp_parser *parser, enum pragma_context context) return true; case PRAGMA_OMP_SECTION: - error ("%<#pragma omp section%> may only be used in " - "%<#pragma omp sections%> construct"); + error ("%H%<#pragma omp section%> may only be used in " + "%<#pragma omp sections%> construct", &pragma_tok->location); break; default: |