@@ -5221,12 +5221,13 @@ extern tree begin_do_stmt (void);
extern void finish_do_body (tree);
extern void finish_do_stmt (tree, tree);
extern tree finish_return_stmt (tree);
-extern tree begin_for_stmt (void);
+extern tree begin_for_scope (tree *);
+extern tree begin_for_stmt (tree, tree);
extern void finish_for_init_stmt (tree);
extern void finish_for_cond (tree, tree);
extern void finish_for_expr (tree, tree);
extern void finish_for_stmt (tree);
-extern tree begin_range_for_stmt (void);
+extern tree begin_range_for_stmt (tree, tree);
extern void finish_range_for_decl (tree, tree, tree);
extern void finish_range_for_stmt (tree);
extern tree finish_break_stmt (void);
@@ -3108,7 +3108,7 @@ build_vec_init (tree base, tree maxindex, tree init,
tree elt_init;
tree to;
- for_stmt = begin_for_stmt ();
+ for_stmt = begin_for_stmt (NULL_TREE, NULL_TREE);
finish_for_init_stmt (for_stmt);
finish_for_cond (build2 (NE_EXPR, boolean_type_node, iterator,
build_int_cst (TREE_TYPE (iterator), -1)),
@@ -270,6 +270,12 @@ typedef enum required_token {
RT_CLASS_TYPENAME_TEMPLATE /* class, typename, or template */
} required_token;
+typedef enum kind_of_for_loop
+{
+ FOR_LOOP_EXPRESSION,
+ FOR_LOOP_DECLARATION,
+ FOR_LOOP_RANGE
+} kind_of_for_loop;
/* Prototypes. */
static cp_lexer *cp_lexer_new_main
@@ -1850,12 +1856,14 @@ static tree cp_parser_condition
(cp_parser *);
static tree cp_parser_iteration_statement
(cp_parser *);
-static void cp_parser_for_init_statement
- (cp_parser *);
-static tree cp_parser_c_for
- (cp_parser *);
-static tree cp_parser_range_for
+static kind_of_for_loop cp_parser_for_init_statement
+ (cp_parser *, tree *decl);
+static tree cp_parser_for
(cp_parser *);
+static tree cp_parser_c_for
+ (cp_parser *, tree, tree, kind_of_for_loop);
+static tree cp_parser_range_for
+ (cp_parser *, tree, tree, tree);
static tree cp_parser_jump_statement
(cp_parser *);
static void cp_parser_declaration_statement
@@ -1875,7 +1883,7 @@ static void cp_parser_declaration
static void cp_parser_block_declaration
(cp_parser *, bool);
static void cp_parser_simple_declaration
- (cp_parser *, bool);
+ (cp_parser *, bool, tree *);
static void cp_parser_decl_specifier_seq
(cp_parser *, cp_parser_flags, cp_decl_specifier_seq *, int *);
static tree cp_parser_storage_class_specifier_opt
@@ -1925,7 +1933,7 @@ 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,gc)*, bool, bool, int, bool *);
+ (cp_parser *, cp_decl_specifier_seq *, VEC (deferred_access_check,gc)*, bool, bool, int, bool *, tree *);
static cp_declarator *cp_parser_declarator
(cp_parser *, cp_parser_declarator_kind, int *, bool *, bool);
static cp_declarator *cp_parser_direct_declarator
@@ -8652,20 +8660,38 @@ cp_parser_condition (cp_parser* parser)
/* Parses a traditional for-statement until the closing ')', not included. */
static tree
-cp_parser_c_for (cp_parser *parser)
+cp_parser_for (cp_parser *parser)
+{
+ tree init, scope, decl;
+ kind_of_for_loop kind;
+
+ /* Begin the for-statement. */
+ scope = begin_for_scope (&init);
+
+ /* Parse the initialization. */
+ kind = cp_parser_for_init_statement (parser, &decl);
+
+ if (kind == FOR_LOOP_RANGE)
+ return cp_parser_range_for (parser, scope, init, decl);
+ else
+ return cp_parser_c_for (parser, scope, init, kind);
+}
+
+static tree
+cp_parser_c_for (cp_parser *parser, tree scope, tree init,
+ kind_of_for_loop kind)
{
/* Normal for loop */
- tree stmt;
tree condition = NULL_TREE;
tree expression = NULL_TREE;
+ tree stmt;
- /* Begin the for-statement. */
- stmt = begin_for_stmt ();
+ stmt = begin_for_stmt (scope, init);
- /* Parse the initialization. */
- cp_parser_for_init_statement (parser);
- finish_for_init_stmt (stmt);
+ if (kind == FOR_LOOP_EXPRESSION)
+ cp_parser_expression_statement (parser, NULL_TREE);
+ finish_for_init_stmt (stmt);
/* If there's a condition, process it. */
if (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON))
condition = cp_parser_condition (parser);
@@ -8684,7 +8710,7 @@ cp_parser_c_for (cp_parser *parser)
/* Tries to parse a range-based for-statement:
range-based-for:
- type-specifier-seq declarator : expression
+ decl-specifier-seq declarator : expression
If succesful, assigns to *DECL the DECLARATOR and to *EXPR the
expression. Note that the *DECL is returned unfinished, so
@@ -8693,48 +8719,10 @@ cp_parser_c_for (cp_parser *parser)
Returns TRUE iff a range-based for is parsed. */
static tree
-cp_parser_range_for (cp_parser *parser)
+cp_parser_range_for (cp_parser *parser, tree scope, tree init, tree range_decl)
{
- tree stmt, range_decl, range_expr;
- cp_decl_specifier_seq type_specifiers;
- cp_declarator *declarator;
- const char *saved_message;
- tree attributes, pushed_scope;
+ tree stmt, range_expr;
- cp_parser_parse_tentatively (parser);
- /* New types are not allowed in the type-specifier-seq for a
- range-based for loop. */
- saved_message = parser->type_definition_forbidden_message;
- parser->type_definition_forbidden_message
- = G_("types may not be defined in range-based for loops");
- /* Parse the type-specifier-seq. */
- cp_parser_type_specifier_seq (parser, /*is_declaration==*/true,
- /*is_trailing_return=*/false,
- &type_specifiers);
- /* Restore the saved message. */
- parser->type_definition_forbidden_message = saved_message;
- /* If all is well, we might be looking at a declaration. */
- if (cp_parser_error_occurred (parser))
- {
- cp_parser_abort_tentative_parse (parser);
- return NULL_TREE;
- }
- /* Parse the declarator. */
- declarator = cp_parser_declarator (parser, CP_PARSER_DECLARATOR_NAMED,
- /*ctor_dtor_or_conv_p=*/NULL,
- /*parenthesized_p=*/NULL,
- /*member_p=*/false);
- /* Parse the attributes. */
- attributes = cp_parser_attributes_opt (parser);
- /* The next token should be `:'. */
- if (cp_lexer_next_token_is_not (parser->lexer, CPP_COLON))
- cp_parser_simulate_error (parser);
-
- /* Check if it is a range-based for */
- if (!cp_parser_parse_definitely (parser))
- return NULL_TREE;
-
- cp_parser_require (parser, CPP_COLON, RT_COLON);
if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
{
bool expr_non_constant_p;
@@ -8746,23 +8734,16 @@ cp_parser_range_for (cp_parser *parser)
/* If in template, STMT is converted to a normal for-statements
at instantiation. If not, it is done just ahead. */
if (processing_template_decl)
- stmt = begin_range_for_stmt ();
- else
- stmt = begin_for_stmt ();
-
- /* Create the declaration. It must be after begin{,_range}_for_stmt(). */
- range_decl = start_decl (declarator, &type_specifiers,
- /*initialized_p=*/SD_INITIALIZED,
- attributes, /*prefix_attributes=*/NULL_TREE,
- &pushed_scope);
- /* No scope allowed here */
- pop_scope (pushed_scope);
-
- if (TREE_CODE (stmt) == RANGE_FOR_STMT)
- finish_range_for_decl (stmt, range_decl, range_expr);
+ {
+ stmt = begin_range_for_stmt (scope, init);
+ finish_range_for_decl (stmt, range_decl, range_expr);
+ }
else
- /* Convert the range-based for loop into a normal for-statement. */
- stmt = cp_convert_range_for (stmt, range_decl, range_expr);
+ {
+ stmt = begin_for_stmt (scope, init);
+ /* Convert the range-based for loop into a normal for-statement. */
+ stmt = cp_convert_range_for (stmt, range_decl, range_expr);
+ }
return stmt;
}
@@ -8989,12 +8970,7 @@ cp_parser_iteration_statement (cp_parser* parser)
/* Look for the `('. */
cp_parser_require (parser, CPP_OPEN_PAREN, RT_OPEN_PAREN);
- if (cxx_dialect == cxx0x)
- statement = cp_parser_range_for (parser);
- else
- statement = NULL_TREE;
- if (statement == NULL_TREE)
- statement = cp_parser_c_for (parser);
+ statement = cp_parser_for (parser);
/* Look for the `)'. */
cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);
@@ -9024,8 +9000,8 @@ cp_parser_iteration_statement (cp_parser* parser)
expression-statement
simple-declaration */
-static void
-cp_parser_for_init_statement (cp_parser* parser)
+static kind_of_for_loop
+cp_parser_for_init_statement (cp_parser* parser, tree *decl)
{
/* If the next token is a `;', then we have an empty
expression-statement. Grammatically, this is also a
@@ -9035,19 +9011,44 @@ cp_parser_for_init_statement (cp_parser* parser)
declaration. */
if (cp_lexer_next_token_is_not (parser->lexer, CPP_SEMICOLON))
{
+ kind_of_for_loop res = FOR_LOOP_DECLARATION;
/* We're going to speculatively look for a declaration, falling back
to an expression, if necessary. */
cp_parser_parse_tentatively (parser);
/* Parse the declaration. */
cp_parser_simple_declaration (parser,
- /*function_definition_allowed_p=*/false);
+ /*function_definition_allowed_p=*/false,
+ decl);
/* If the tentative parse failed, then we shall need to look for an
expression-statement. */
+ if (cp_lexer_next_token_is (parser->lexer, CPP_COLON))
+ {
+ if (cxx_dialect < cxx0x)
+ {
+ location_t loc = cp_lexer_peek_token (parser->lexer)->location;
+ error_at (loc, "range-based-for loops are not allowed "
+ "in C++98 mode");
+ cp_parser_skip_to_closing_parenthesis (parser,
+ /*recovering=*/true,
+ /*or_comma=*/false,
+ /*consume_paren=*/false);
+ }
+ else
+ {
+ /* Consume the ':' */
+ cp_lexer_consume_token (parser->lexer);
+ res = FOR_LOOP_RANGE;
+ }
+ }
+ else
+ /* The ';' is not consumed yet because we told
+ cp_parser_simple_declaration not to. */
+ cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+
if (cp_parser_parse_definitely (parser))
- return;
+ return res;
}
-
- cp_parser_expression_statement (parser, NULL_TREE);
+ return FOR_LOOP_EXPRESSION;
}
/* Parse a jump-statement.
@@ -9534,7 +9535,8 @@ cp_parser_block_declaration (cp_parser *parser,
cp_parser_static_assert (parser, /*member_p=*/false);
/* Anything else must be a simple-declaration. */
else
- cp_parser_simple_declaration (parser, !statement_p);
+ cp_parser_simple_declaration (parser, !statement_p,
+ /*just_one_declarator*/NULL);
}
/* Parse a simple-declaration.
@@ -9547,16 +9549,24 @@ cp_parser_block_declaration (cp_parser *parser,
init-declarator-list , init-declarator
If FUNCTION_DEFINITION_ALLOWED_P is TRUE, then we also recognize a
- function-definition as a simple-declaration. */
+ function-definition as a simple-declaration.
+
+ If JUST_ONE_DECLARATOR is not NULL, the pointed tree will be set to the
+ parsed declaration iff it is a single declarator. In either way, the
+ trailing `;', if present, will not be checked nor consumed. */
static void
cp_parser_simple_declaration (cp_parser* parser,
- bool function_definition_allowed_p)
+ bool function_definition_allowed_p,
+ tree *just_one_declarator)
{
cp_decl_specifier_seq decl_specifiers;
int declares_class_or_enum;
bool saw_declarator;
+ if (just_one_declarator)
+ *just_one_declarator = NULL_TREE;
+
/* Defer access checks until we know what is being declared; the
checks for names appearing in the decl-specifier-seq should be
done as if we were in the scope of the thing being declared. */
@@ -9631,6 +9641,8 @@ cp_parser_simple_declaration (cp_parser* parser,
token = cp_lexer_peek_token (parser->lexer);
gcc_assert (token->type == CPP_COMMA);
cp_lexer_consume_token (parser->lexer);
+ if (just_one_declarator)
+ *just_one_declarator = error_mark_node;
}
else
saw_declarator = true;
@@ -9641,7 +9653,8 @@ cp_parser_simple_declaration (cp_parser* parser,
function_definition_allowed_p,
/*member_p=*/false,
declares_class_or_enum,
- &function_definition_p);
+ &function_definition_p,
+ just_one_declarator);
/* 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
@@ -9671,13 +9684,17 @@ cp_parser_simple_declaration (cp_parser* parser,
return;
}
}
+ if (just_one_declarator && *just_one_declarator == NULL_TREE)
+ *just_one_declarator = decl;
/* The next token should be either a `,' or a `;'. */
token = cp_lexer_peek_token (parser->lexer);
/* If it's a `,', there are more declarators to come. */
if (token->type == CPP_COMMA)
/* will be consumed next time around */;
/* If it's a `;', we are done. */
- else if (token->type == CPP_SEMICOLON)
+ else if (token->type == CPP_SEMICOLON
+ || (just_one_declarator
+ && *just_one_declarator != error_mark_node))
break;
/* Anything else is an error. */
else
@@ -9715,7 +9732,8 @@ cp_parser_simple_declaration (cp_parser* parser,
}
/* Consume the `;'. */
- cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
+ if (!just_one_declarator)
+ cp_parser_require (parser, CPP_SEMICOLON, RT_SEMICOLON);
done:
pop_deferring_access_checks ();
@@ -14319,7 +14337,13 @@ cp_parser_asm_definition (cp_parser* parser)
have been completely parsed.
FUNCTION_DEFINITION_P may be NULL if FUNCTION_DEFINITION_ALLOWED_P
- is FALSE. */
+ is FALSE.
+
+ If JUST_ONE_DECLARATOR is not NULL, the pointed tree will be set to the
+ parsed declaration iff it is a single declarator without initialization.
+ The trailing ';' if present will not be checked nor consumed.
+ If returned, the declarator will be created with SD_INITIALIZED but
+ will not call cp_finish_decl. */
static tree
cp_parser_init_declarator (cp_parser* parser,
@@ -14328,7 +14352,8 @@ cp_parser_init_declarator (cp_parser* parser,
bool function_definition_allowed_p,
bool member_p,
int declares_class_or_enum,
- bool* function_definition_p)
+ bool* function_definition_p,
+ tree* just_one_declarator)
{
cp_token *token = NULL, *asm_spec_start_token = NULL,
*attributes_start_token = NULL;
@@ -14492,6 +14517,8 @@ cp_parser_init_declarator (cp_parser* parser,
{
is_initialized = SD_INITIALIZED;
initialization_kind = token->type;
+ if (just_one_declarator)
+ *just_one_declarator = error_mark_node;
if (token->type == CPP_EQ
&& function_declarator_p (declarator))
@@ -14505,16 +14532,23 @@ cp_parser_init_declarator (cp_parser* parser,
}
else
{
+ is_initialized = SD_UNINITIALIZED;
+ initialization_kind = CPP_EOF;
/* If the init-declarator isn't initialized and isn't followed by a
`,' or `;', it's not a valid init-declarator. */
if (token->type != CPP_COMMA
&& token->type != CPP_SEMICOLON)
{
- cp_parser_error (parser, "expected initializer");
- return error_mark_node;
+ if (just_one_declarator && *just_one_declarator != error_mark_node)
+ {
+ is_initialized = SD_INITIALIZED;
+ }
+ else
+ {
+ cp_parser_error (parser, "expected initializer");
+ return error_mark_node;
+ }
}
- is_initialized = SD_UNINITIALIZED;
- initialization_kind = CPP_EOF;
}
/* Because start_decl has side-effects, we should only call it if we
@@ -14590,7 +14624,7 @@ cp_parser_init_declarator (cp_parser* parser,
initializer = NULL_TREE;
is_direct_init = false;
is_non_constant_init = true;
- if (is_initialized)
+ if (is_initialized && initialization_kind != CPP_EOF)
{
if (function_declarator_p (declarator))
{
@@ -14658,7 +14692,8 @@ cp_parser_init_declarator (cp_parser* parser,
/* Finish processing the declaration. But, skip friend
declarations. */
- if (!friend_p && decl && decl != error_mark_node)
+ if (!friend_p && decl && decl != error_mark_node
+ && (!is_initialized || initialization_kind != CPP_EOF))
{
cp_finish_decl (decl,
initializer, !is_non_constant_init,
@@ -19904,7 +19939,8 @@ cp_parser_single_declaration (cp_parser* parser,
/*function_definition_allowed_p=*/true,
member_p,
declares_class_or_enum,
- &function_definition_p);
+ &function_definition_p,
+ NULL);
/* 7.1.1-1 [dcl.stc]
@@ -12051,7 +12051,7 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
}
case FOR_STMT:
- stmt = begin_for_stmt ();
+ stmt = begin_for_stmt (NULL_TREE, NULL_TREE);
RECUR (FOR_INIT_STMT (t));
finish_for_init_stmt (stmt);
tmp = RECUR (FOR_COND (t));
@@ -12065,7 +12065,7 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl,
case RANGE_FOR_STMT:
{
tree decl, expr;
- stmt = begin_for_stmt ();
+ stmt = begin_for_stmt (NULL_TREE, NULL_TREE);
decl = RANGE_FOR_DECL (t);
decl = tsubst (decl, args, complain, in_decl);
maybe_push_decl (decl);
@@ -826,21 +826,44 @@ finish_return_stmt (tree expr)
return r;
}
-/* Begin a for-statement. Returns a new FOR_STMT if appropriate. */
+/* Begin the scope of a for-statement or a range-for-statement.
+ Both the returned trees are to be used in a call to
+ begin_for_stmt or begin_range_for_stmt. */
tree
-begin_for_stmt (void)
+begin_for_scope (tree *init)
+{
+ tree scope = NULL_TREE;
+ if (flag_new_for_scope > 0)
+ scope = do_pushlevel (sk_for);
+
+ if (processing_template_decl)
+ *init = push_stmt_list ();
+ else
+ *init = NULL_TREE;
+
+ return scope;
+}
+
+/* Begin a for-statement. Returns a new FOR_STMT.
+ SCOPE and INIT should be the return of begin_for_scope,
+ or both NULL_TREE */
+
+tree
+begin_for_stmt (tree scope, tree init)
{
tree r;
r = build_stmt (input_location, FOR_STMT, NULL_TREE, NULL_TREE,
NULL_TREE, NULL_TREE);
- if (flag_new_for_scope > 0)
- TREE_CHAIN (r) = do_pushlevel (sk_for);
-
- if (processing_template_decl)
- FOR_INIT_STMT (r) = push_stmt_list ();
+ if (scope == NULL_TREE)
+ {
+ gcc_assert (!init);
+ scope = begin_for_scope (&init);
+ }
+ FOR_INIT_STMT (r) = init;
+ TREE_CHAIN (r) = scope;
return r;
}
@@ -924,18 +947,29 @@ finish_for_stmt (tree for_stmt)
}
/* Begin a range-for-statement. Returns a new RANGE_FOR_STMT.
+ SCOPE and INIT should be the return of begin_for_scope,
+ or both NULL_TREE .
To finish it call finish_for_stmt(). */
tree
-begin_range_for_stmt (void)
+begin_range_for_stmt (tree scope, tree init)
{
tree r;
r = build_stmt (input_location, RANGE_FOR_STMT,
NULL_TREE, NULL_TREE, NULL_TREE);
- if (flag_new_for_scope > 0)
- TREE_CHAIN (r) = do_pushlevel (sk_for);
+ if (scope == NULL_TREE)
+ {
+ gcc_assert (!init);
+ scope = begin_for_scope (&init);
+ }
+
+ /* RANGE_FOR_STMTs do not use nor save the init tree, so we
+ pop it now. */
+ if (init)
+ pop_stmt_list (init);
+ TREE_CHAIN (r) = scope;
return r;
}
@@ -3,8 +3,6 @@
// { dg-do run }
// { dg-options "-std=c++0x" }
-#include <cstdio>
-
/* Preliminary declarations */
namespace pre
{
@@ -48,7 +46,6 @@ container run_me_just_once()
}
/* Template with dependent expression. */
-/* Template with dependent expression. */
template<typename T> int test1(const T &r)
{
int t = 0;