diff options
| author | dim <dim@FreeBSD.org> | 2015-07-05 14:23:59 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-07-05 14:23:59 +0000 |
| commit | e7bcad327814a78ecb8d5f5545d2e3df84c67a5c (patch) | |
| tree | ac719b5984165053bf83d71142e4d96b609b9784 /lib/Parse/ParseTentative.cpp | |
| parent | 9dd834653b811ad20382e98a87dff824980c9916 (diff) | |
| download | FreeBSD-src-e7bcad327814a78ecb8d5f5545d2e3df84c67a5c.zip FreeBSD-src-e7bcad327814a78ecb8d5f5545d2e3df84c67a5c.tar.gz | |
Vendor import of clang trunk r241361:
https://llvm.org/svn/llvm-project/cfe/trunk@241361
Diffstat (limited to 'lib/Parse/ParseTentative.cpp')
| -rw-r--r-- | lib/Parse/ParseTentative.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp index d63cf24..368cb93 100644 --- a/lib/Parse/ParseTentative.cpp +++ b/lib/Parse/ParseTentative.cpp @@ -632,8 +632,8 @@ Parser::TPResult Parser::TryParsePtrOperatorSeq() { // ptr-operator ConsumeToken(); while (Tok.isOneOf(tok::kw_const, tok::kw_volatile, tok::kw_restrict, - tok::kw___nonnull, tok::kw___nullable, - tok::kw___null_unspecified)) + tok::kw__Nonnull, tok::kw__Nullable, + tok::kw__Null_unspecified)) ConsumeToken(); } else { return TPResult::True; @@ -1213,9 +1213,11 @@ Parser::isCXXDeclarationSpecifier(Parser::TPResult BracedCastResult, // 'friend' // 'typedef' // 'constexpr' + // 'concept' case tok::kw_friend: case tok::kw_typedef: case tok::kw_constexpr: + case tok::kw_concept: // storage-class-specifier case tok::kw_register: case tok::kw_static: @@ -1276,9 +1278,9 @@ Parser::isCXXDeclarationSpecifier(Parser::TPResult BracedCastResult, case tok::kw___ptr32: case tok::kw___forceinline: case tok::kw___unaligned: - case tok::kw___nonnull: - case tok::kw___nullable: - case tok::kw___null_unspecified: + case tok::kw__Nonnull: + case tok::kw__Nullable: + case tok::kw__Null_unspecified: return TPResult::True; // Borland |
