diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2018-05-21 20:44:33 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2018-05-21 20:44:33 +0000 |
| commit | 54c22d96728f3f8197d46458d4b8f4d6e1e2520e (patch) | |
| tree | 09f448a5383ceaaf99426442bb59597e6ef34e96 /gcc/cp/parser.c | |
| parent | a3c7081913149383df639270f4972d3d5876b7b3 (diff) | |
| download | gcc-54c22d96728f3f8197d46458d4b8f4d6e1e2520e.zip gcc-54c22d96728f3f8197d46458d4b8f4d6e1e2520e.tar.gz gcc-54c22d96728f3f8197d46458d4b8f4d6e1e2520e.tar.bz2 | |
parser.c (cp_parser_parameter_declaration_list): Remove bool* parameter.
2018-05-21 Paolo Carlini <paolo.carlini@oracle.com>
* parser.c (cp_parser_parameter_declaration_list): Remove
bool* parameter.
(cp_parser_parameter_declaration_clause): Adjust.
(cp_parser_cache_defarg): Likewise.
From-SVN: r260486
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3f62191..6f51f03 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -2235,7 +2235,7 @@ static void cp_parser_type_specifier_seq static tree cp_parser_parameter_declaration_clause (cp_parser *); static tree cp_parser_parameter_declaration_list - (cp_parser *, bool *); + (cp_parser *); static cp_parameter_declarator *cp_parser_parameter_declaration (cp_parser *, bool, bool *); static tree cp_parser_default_argument @@ -21242,7 +21242,6 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) tree parameters; cp_token *token; bool ellipsis_p; - bool is_error; temp_override<bool> cleanup (parser->auto_is_implicit_function_template_parm_p); @@ -21290,12 +21289,12 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) } /* Parse the parameter-declaration-list. */ - parameters = cp_parser_parameter_declaration_list (parser, &is_error); + parameters = cp_parser_parameter_declaration_list (parser); /* If a parse error occurred while parsing the parameter-declaration-list, then the entire parameter-declaration-clause is erroneous. */ - if (is_error) - return NULL; + if (parameters == error_mark_node) + return NULL_TREE; /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); @@ -21335,19 +21334,16 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) Returns a representation of the parameter-declaration-list, as for cp_parser_parameter_declaration_clause. However, the - `void_list_node' is never appended to the list. Upon return, - *IS_ERROR will be true iff an error occurred. */ + `void_list_node' is never appended to the list. */ static tree -cp_parser_parameter_declaration_list (cp_parser* parser, bool *is_error) +cp_parser_parameter_declaration_list (cp_parser* parser) { tree parameters = NULL_TREE; tree *tail = ¶meters; bool saved_in_unbraced_linkage_specification_p; int index = 0; - /* Assume all will go well. */ - *is_error = false; /* The special considerations that apply to a function within an unbraced linkage specifications do not apply to the parameters to the function. */ @@ -21389,7 +21385,6 @@ cp_parser_parameter_declaration_list (cp_parser* parser, bool *is_error) then the entire parameter-declaration-list is erroneous. */ if (decl == error_mark_node) { - *is_error = true; parameters = error_mark_node; break; } @@ -29009,7 +29004,9 @@ cp_parser_cache_defarg (cp_parser *parser, bool nsdmi) { cp_lexer_consume_token (parser->lexer); begin_scope (sk_function_parms, NULL_TREE); - cp_parser_parameter_declaration_list (parser, &error); + if (cp_parser_parameter_declaration_list (parser) + == error_mark_node) + error = true; pop_bindings_and_leave_scope (); } if (!cp_parser_error_occurred (parser) && !error) |