Hi again,
thus, in order to deal with the various subissues we have got, I
prepared the below, which passes testing. As you can see, the diagnostic
triggers only once, for the left-most '=' and/or the left-most ','. I
suppose that's Ok, I'm not 100% sure about the wording of the error
messages though. Otherwise, I'm quite happy with the patch ;) modulo
maybe the need to pass around a location_t*, isn't something we do very
often. Let me know...
Thanks,
Paolo.
//////////////////////////
Index: cp/parser.c
===================================================================
--- cp/parser.c (revision 219042)
+++ cp/parser.c (working copy)
@@ -2124,7 +2124,8 @@ static tree cp_parser_decltype
/* Declarators [gram.dcl.decl] */
static tree cp_parser_init_declarator
- (cp_parser *, cp_decl_specifier_seq *, vec<deferred_access_check, va_gc> *,
bool, bool, int, bool *, tree *);
+ (cp_parser *, cp_decl_specifier_seq *, vec<deferred_access_check, va_gc> *,
+ bool, bool, int, bool *, tree *, location_t *);
static cp_declarator *cp_parser_declarator
(cp_parser *, cp_parser_declarator_kind, int *, bool *, bool, bool);
static cp_declarator *cp_parser_direct_declarator
@@ -11454,6 +11455,8 @@ cp_parser_simple_declaration (cp_parser* parser,
cp_decl_specifier_seq decl_specifiers;
int declares_class_or_enum;
bool saw_declarator;
+ location_t comma_loc = UNKNOWN_LOCATION;
+ location_t equal_loc = UNKNOWN_LOCATION;
if (maybe_range_for_decl)
*maybe_range_for_decl = NULL_TREE;
@@ -11528,12 +11531,16 @@ cp_parser_simple_declaration (cp_parser* parser,
if (saw_declarator)
{
- /* If we are processing next declarator, coma is expected */
+ /* If we are processing next declarator, comma is expected */
token = cp_lexer_peek_token (parser->lexer);
gcc_assert (token->type == CPP_COMMA);
cp_lexer_consume_token (parser->lexer);
if (maybe_range_for_decl)
- *maybe_range_for_decl = error_mark_node;
+ {
+ *maybe_range_for_decl = error_mark_node;
+ if (comma_loc == UNKNOWN_LOCATION)
+ comma_loc = token->location;
+ }
}
else
saw_declarator = true;
@@ -11545,7 +11552,8 @@ cp_parser_simple_declaration (cp_parser* parser,
/*member_p=*/false,
declares_class_or_enum,
&function_definition_p,
- maybe_range_for_decl);
+ maybe_range_for_decl,
+ &equal_loc);
/* If an error occurred while parsing tentatively, exit quickly.
(That usually happens when in the body of a function; each
statement is treated as a declaration-statement until proven
@@ -11631,7 +11639,15 @@ cp_parser_simple_declaration (cp_parser* parser,
/* Consume the `;'. */
if (!maybe_range_for_decl)
- cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+ cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+ else if (cp_lexer_next_token_is (parser->lexer, CPP_COLON))
+ {
+ if (equal_loc != UNKNOWN_LOCATION)
+ error_at (equal_loc, "initializer in range-based %<for%> loop");
+ if (comma_loc != UNKNOWN_LOCATION)
+ error_at (comma_loc,
+ "multiple declarations in range-based %<for%> loop");
+ }
done:
pop_deferring_access_checks ();
@@ -16842,8 +16858,13 @@ cp_parser_asm_definition (cp_parser* parser)
parsed declaration if it is an uninitialized single declarator not followed
by a `;', or to error_mark_node otherwise. Either way, the trailing `;',
if present, will not be consumed. If returned, this declarator will be
- created with SD_INITIALIZED but will not call cp_finish_decl. */
+ created with SD_INITIALIZED but will not call cp_finish_decl.
+ If MAYBE_RANGE_FOR_DECL is not NULL, and *EQUAL_LOC is equal to
+ UNKNOWN_LOCATION, and there is an initializer, the pointed location_t
+ is set to the location of the '=' (or `(', or '{' in C++11) token
+ introducing the initializer. */
+
static tree
cp_parser_init_declarator (cp_parser* parser,
cp_decl_specifier_seq *decl_specifiers,
@@ -16852,7 +16873,8 @@ cp_parser_init_declarator (cp_parser* parser,
bool member_p,
int declares_class_or_enum,
bool* function_definition_p,
- tree* maybe_range_for_decl)
+ tree* maybe_range_for_decl,
+ location_t* equal_loc)
{
cp_token *token = NULL, *asm_spec_start_token = NULL,
*attributes_start_token = NULL;
@@ -16875,6 +16897,7 @@ cp_parser_init_declarator (cp_parser* parser,
tree pushed_scope = NULL_TREE;
bool range_for_decl_p = false;
bool saved_default_arg_ok_p = parser->default_arg_ok_p;
+ location_t tmp_equal_loc = UNKNOWN_LOCATION;
/* Gather the attributes that were provided with the
decl-specifiers. */
@@ -17040,7 +17063,11 @@ cp_parser_init_declarator (cp_parser* parser,
is_initialized = SD_INITIALIZED;
initialization_kind = token->type;
if (maybe_range_for_decl)
- *maybe_range_for_decl = error_mark_node;
+ {
+ *maybe_range_for_decl = error_mark_node;
+ if (*equal_loc == UNKNOWN_LOCATION)
+ tmp_equal_loc = token->location;
+ }
if (token->type == CPP_EQ
&& function_declarator_p (declarator))
@@ -17063,7 +17090,8 @@ cp_parser_init_declarator (cp_parser* parser,
range_for_decl_p = true;
else
{
- cp_parser_error (parser, "expected initializer");
+ if (!maybe_range_for_decl)
+ cp_parser_error (parser, "expected initializer");
return error_mark_node;
}
}
@@ -17168,6 +17196,8 @@ cp_parser_init_declarator (cp_parser* parser,
finish_lambda_scope ();
if (initializer == error_mark_node)
cp_parser_skip_to_end_of_statement (parser);
+ else if (initializer && tmp_equal_loc != UNKNOWN_LOCATION)
+ *equal_loc = tmp_equal_loc;
}
}
@@ -23726,7 +23756,7 @@ cp_parser_single_declaration (cp_parser* parser,
member_p,
declares_class_or_enum,
&function_definition_p,
- NULL);
+ NULL, NULL);
/* 7.1.1-1 [dcl.stc]
Index: testsuite/g++.dg/cpp0x/range-for29.C
===================================================================
--- testsuite/g++.dg/cpp0x/range-for29.C (revision 0)
+++ testsuite/g++.dg/cpp0x/range-for29.C (working copy)
@@ -0,0 +1,13 @@
+// PR c++/63985
+// { dg-require-effective-target c++11 }
+
+void foo()
+{
+ int arr;
+
+ for (int i = 5: arr) // { dg-error "initializer in range-based" }
+ ;
+
+ for (int i, j: arr) // { dg-error "multiple declarations in range-based" }
+ ;
+}
