diff options
author | Jakub Jelinek <jakub@redhat.com> | 2018-11-09 21:22:48 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-11-09 21:22:48 +0100 |
commit | 81a227c6054a82118d80d3f4b2fffb44bc43aae2 (patch) | |
tree | 30c7e65f2d000b57efa94b635ccf00982a12d453 /gcc/cp/parser.c | |
parent | 98c91c56bbe8a46ea46f6ca7c85a87c49c258372 (diff) | |
download | gcc-81a227c6054a82118d80d3f4b2fffb44bc43aae2.zip gcc-81a227c6054a82118d80d3f4b2fffb44bc43aae2.tar.gz gcc-81a227c6054a82118d80d3f4b2fffb44bc43aae2.tar.bz2 |
c-parser.c (c_parser_omp_clause_final): Use c_parser_expr_no_commas...
c/
* c-parser.c (c_parser_omp_clause_final): Use
c_parser_expr_no_commas, convert_lvalue_to_rvalue,
c_objc_common_truthvalue_conversion, c_fully_fold and parentheses
parsing instead of c_parser_paren_condition.
(c_parser_omp_clause_if): Use c_parser_expr_no_commas,
convert_lvalue_to_rvalue, c_objc_common_truthvalue_conversion and
c_fully_fold instead of c_parser_condition.
(c_parser_omp_clause_num_threads, c_parser_omp_clause_num_tasks,
c_parser_omp_clause_grainsize, c_parser_omp_clause_priority,
c_parser_omp_clause_hint, c_parser_omp_clause_num_teams,
c_parser_omp_clause_thread_limit, c_parser_omp_clause_linear): Use
c_parser_expr_no_commas instead of c_parser_expression.
cp/
* parser.c (cp_parser_omp_clause_final, cp_parser_omp_clause_if): Use
cp_parser_assignment_expression instead of cp_parser_condition.
(cp_parser_omp_clause_num_threads, cp_parser_omp_clause_num_tasks,
cp_parser_omp_clause_grainsize, cp_parser_omp_clause_priority,
cp_parser_omp_clause_num_teams, cp_parser_omp_clause_thread_limit,
cp_parser_omp_clause_linear, cp_parser_omp_clause_device): Use
cp_parser_assignment_expression instead of cp_parser_expression.
(cp_parser_omp_clause_hint): Likewise. Formatting fix.
testsuite/
* c-c++-common/gomp/clauses-5.c: New test.
From-SVN: r265990
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r-- | gcc/cp/parser.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 17fa629..1766ef4 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -32469,7 +32469,7 @@ cp_parser_omp_clause_final (cp_parser *parser, tree list, location_t location) if (!parens.require_open (parser)) return list; - t = cp_parser_condition (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32592,7 +32592,7 @@ cp_parser_omp_clause_if (cp_parser *parser, tree list, location_t location, } } - t = cp_parser_condition (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32696,7 +32696,7 @@ cp_parser_omp_clause_num_threads (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32727,7 +32727,7 @@ cp_parser_omp_clause_num_tasks (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32758,7 +32758,7 @@ cp_parser_omp_clause_grainsize (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32789,7 +32789,7 @@ cp_parser_omp_clause_priority (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -32811,8 +32811,7 @@ cp_parser_omp_clause_priority (cp_parser *parser, tree list, hint ( expression ) */ static tree -cp_parser_omp_clause_hint (cp_parser *parser, tree list, - location_t location) +cp_parser_omp_clause_hint (cp_parser *parser, tree list, location_t location) { tree t, c; @@ -32820,7 +32819,7 @@ cp_parser_omp_clause_hint (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -33442,7 +33441,7 @@ cp_parser_omp_clause_num_teams (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -33473,7 +33472,7 @@ cp_parser_omp_clause_thread_limit (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) @@ -33641,7 +33640,7 @@ cp_parser_omp_clause_linear (cp_parser *parser, tree list, step = NULL_TREE; } if (!step) - step = cp_parser_expression (parser); + step = cp_parser_assignment_expression (parser); if (!parens.require_close (parser)) cp_parser_skip_to_closing_parenthesis (parser, /*recovering=*/true, @@ -34151,7 +34150,7 @@ cp_parser_omp_clause_device (cp_parser *parser, tree list, if (!parens.require_open (parser)) return list; - t = cp_parser_expression (parser); + t = cp_parser_assignment_expression (parser); if (t == error_mark_node || !parens.require_close (parser)) |