diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-10-15 16:36:11 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-10-15 16:36:11 +0000 |
| commit | 09560e7f4dadaa207f8bc94a848811ae0bbf948f (patch) | |
| tree | c4af60d10233b14ad5ff26eb9ae83f38709ceda0 /gcc | |
| parent | a1b499a31047004bb5966c835413c2f5aa16446e (diff) | |
| download | gcc-09560e7f4dadaa207f8bc94a848811ae0bbf948f.zip gcc-09560e7f4dadaa207f8bc94a848811ae0bbf948f.tar.gz gcc-09560e7f4dadaa207f8bc94a848811ae0bbf948f.tar.bz2 | |
re PR c++/58707 ([C++11] A greater-than operator in square brackets should not end a template argument list)
/cp
2013-10-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58707
* parser.c (cp_parser_postfix_open_square_expression): Set
parser->greater_than_is_operator_p for the argument.
/testsuite
2013-10-15 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58707
* g++.dg/cpp0x/pr58707.C: New.
From-SVN: r203624
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr58707.C | 6 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d1af382..ed30e1b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2013-10-15 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58707 + * parser.c (cp_parser_postfix_open_square_expression): Set + parser->greater_than_is_operator_p for the argument. + 2013-10-11 Paolo Carlini <paolo.carlini@oracle.com> PR c++/58633 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 4189bf6..e33f5a2 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -6231,10 +6231,14 @@ cp_parser_postfix_open_square_expression (cp_parser *parser, { tree index = NULL_TREE; location_t loc = cp_lexer_peek_token (parser->lexer)->location; + bool saved_greater_than_is_operator_p; /* Consume the `[' token. */ cp_lexer_consume_token (parser->lexer); + saved_greater_than_is_operator_p = parser->greater_than_is_operator_p; + parser->greater_than_is_operator_p = true; + /* Parse the index expression. */ /* ??? For offsetof, there is a question of what to allow here. If offsetof is not being used in an integral constant expression context, @@ -6278,6 +6282,8 @@ cp_parser_postfix_open_square_expression (cp_parser *parser, index = cp_parser_expression (parser, /*cast_p=*/false, NULL); } + parser->greater_than_is_operator_p = saved_greater_than_is_operator_p; + /* Look for the closing `]'. */ cp_parser_require (parser, CPP_CLOSE_SQUARE, RT_CLOSE_SQUARE); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1cbcfdc..f290da8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-10-15 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58707 + * g++.dg/cpp0x/pr58707.C: New. + 2013-10-15 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * c-c++-common/cpp/openmp-define-3.c: Move effective target check diff --git a/gcc/testsuite/g++.dg/cpp0x/pr58707.C b/gcc/testsuite/g++.dg/cpp0x/pr58707.C new file mode 100644 index 0000000..12f2e30 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr58707.C @@ -0,0 +1,6 @@ +// PR c++/58707 +// { dg-do compile { target c++11 } } + +template<int i> class TC { }; +constexpr int foo[] = { 42 }; +TC<foo[0 > 1]> bar; |