diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-10-31 20:29:22 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-10-31 20:29:22 +0000 |
commit | daf2537d16dfc1b82c1f183182f4363c410d9d8e (patch) | |
tree | ee28020a7992b5e10e835e828849f3d7e06a48da | |
parent | 7f519c8361480c7e2951b82e666eb5ccd316da01 (diff) |
Fix usage of right shift operator in fold expressions
The right shift operator was not seen as a valid operator in a fold expression, which is PR32563.
Patch by Nicolas Lesser ("Blitz Rakete")!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@317032 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/Parse/Parser.h | 6 | ||||
-rw-r--r-- | lib/Parse/ParseExpr.cpp | 7 | ||||
-rw-r--r-- | test/Parser/cxx1z-fold-expressions.cpp | 17 |
3 files changed, 27 insertions, 3 deletions
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index a2eef247de..ce60cbb431 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -506,6 +506,12 @@ private: Kind == tok::annot_module_end || Kind == tok::annot_module_include; } + /// \brief Checks if the \p Level is valid for use in a fold expression. + bool isFoldOperator(prec::Level Level) const; + + /// \brief Checks if the \p Kind is a valid operator for fold expressions. + bool isFoldOperator(tok::TokenKind Kind) const; + /// \brief Initialize all pragma handlers. void initializePragmaHandlers(); diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index bff6d9cc19..0f2ec6b1c1 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -266,11 +266,12 @@ bool Parser::diagnoseUnknownTemplateId(ExprResult LHS, SourceLocation Less) { return false; } -static bool isFoldOperator(prec::Level Level) { +bool Parser::isFoldOperator(prec::Level Level) const { return Level > prec::Unknown && Level != prec::Conditional; } -static bool isFoldOperator(tok::TokenKind Kind) { - return isFoldOperator(getBinOpPrecedence(Kind, false, true)); + +bool Parser::isFoldOperator(tok::TokenKind Kind) const { + return isFoldOperator(getBinOpPrecedence(Kind, GreaterThanIsOperator, true)); } /// \brief Parse a binary expression that starts with \p LHS and has a diff --git a/test/Parser/cxx1z-fold-expressions.cpp b/test/Parser/cxx1z-fold-expressions.cpp index b1f7318e41..342f11555f 100644 --- a/test/Parser/cxx1z-fold-expressions.cpp +++ b/test/Parser/cxx1z-fold-expressions.cpp @@ -43,3 +43,20 @@ template<typename ...T> void as_operand_of_cast(int a, T ...t) { (int)(undeclared_junk + ...) + // expected-error {{undeclared}} (int)(a + ...); // expected-error {{does not contain any unexpanded}} } + +// fold-operator can be '>' or '>>'. +template <int... N> constexpr bool greaterThan() { return (N > ...); } +template <int... N> constexpr int rightShift() { return (N >> ...); } + +static_assert(greaterThan<2, 1>()); +static_assert(rightShift<10, 1>() == 5); + +template <auto V> constexpr auto Identity = V; + +// Support fold operators within templates. +template <int... N> constexpr int nestedFoldOperator() { + return Identity<(Identity<0> >> ... >> N)> + + Identity<(N >> ... >> Identity<0>)>; +} + +static_assert(nestedFoldOperator<3, 1>() == 1); |