diff options
| author | Anastasia Stulova <anastasia.stulova@arm.com> | 2016-02-03 15:17:14 +0000 |
|---|---|---|
| committer | Anastasia Stulova <anastasia.stulova@arm.com> | 2016-02-03 15:17:14 +0000 |
| commit | 735c6cdebdcd4292928079cb18a90f0dd5cd65fb (patch) | |
| tree | 282cf3553133ea3ce6f05d27dc6ee4997a71bbf5 /clang/lib/Basic/OperatorPrecedence.cpp | |
| parent | b4ee0af4faf7f0c8f0e9f3419f3fbddcc09a4dab (diff) | |
| download | bcm5719-llvm-735c6cdebdcd4292928079cb18a90f0dd5cd65fb.tar.gz bcm5719-llvm-735c6cdebdcd4292928079cb18a90f0dd5cd65fb.zip | |
[OpenCL] Adding reserved operator logical xor for OpenCL
This patch adds the reserved operator ^^ when compiling for OpenCL (spec v1.1 s6.3.g),
which results in a more meaningful error message.
Patch by Neil Hickey!
Review: http://reviews.llvm.org/D13280
M test/SemaOpenCL/unsupported.cl
M include/clang/Basic/TokenKinds.def
M include/clang/Basic/DiagnosticParseKinds.td
M lib/Basic/OperatorPrecedence.cpp
M lib/Lex/Lexer.cpp
M lib/Parse/ParseExpr.cpp
llvm-svn: 259651
Diffstat (limited to 'clang/lib/Basic/OperatorPrecedence.cpp')
| -rw-r--r-- | clang/lib/Basic/OperatorPrecedence.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Basic/OperatorPrecedence.cpp b/clang/lib/Basic/OperatorPrecedence.cpp index ade8d6d841d..384d23c38af 100644 --- a/clang/lib/Basic/OperatorPrecedence.cpp +++ b/clang/lib/Basic/OperatorPrecedence.cpp @@ -53,6 +53,7 @@ prec::Level getBinOpPrecedence(tok::TokenKind Kind, bool GreaterThanIsOperator, case tok::pipeequal: return prec::Assignment; case tok::question: return prec::Conditional; case tok::pipepipe: return prec::LogicalOr; + case tok::caretcaret: case tok::ampamp: return prec::LogicalAnd; case tok::pipe: return prec::InclusiveOr; case tok::caret: return prec::ExclusiveOr; |
