diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 18:11:16 +0000 |
| commit | 6148c19c738a92f344008aa3f88f4e008bada0ee (patch) | |
| tree | d4426858455f04d0d8c25a2f9eb9ea5582ffe1b6 /contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h | |
| parent | 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (diff) | |
| parent | 173a4f43a911175643bda81ee675e8d9269056ea (diff) | |
| download | FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.zip FreeBSD-src-6148c19c738a92f344008aa3f88f4e008bada0ee.tar.gz | |
Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts,
and preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h b/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h index f68a2e0..4f5f3ab 100644 --- a/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h +++ b/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h @@ -50,7 +50,7 @@ namespace clang { public: /// Begin suppressing access-like checks SuppressAccessChecks(Parser &P, bool activate = true) - : S(P.getActions()), DiagnosticPool(NULL) { + : S(P.getActions()), DiagnosticPool(nullptr) { if (activate) { State = S.PushParsingDeclaration(DiagnosticPool); Active = true; @@ -61,7 +61,7 @@ namespace clang { void done() { assert(Active && "trying to end an inactive suppression"); - S.PopParsingDeclaration(State, NULL); + S.PopParsingDeclaration(State, nullptr); Active = false; } @@ -93,7 +93,7 @@ namespace clang { public: enum NoParent_t { NoParent }; ParsingDeclRAIIObject(Parser &P, NoParent_t _) - : Actions(P.getActions()), DiagnosticPool(NULL) { + : Actions(P.getActions()), DiagnosticPool(nullptr) { push(); } @@ -109,7 +109,7 @@ namespace clang { /// RAII object (which is assumed to be the current top pool). ParsingDeclRAIIObject(Parser &P, ParsingDeclRAIIObject *other) : Actions(P.getActions()), - DiagnosticPool(other ? other->DiagnosticPool.getParent() : NULL) { + DiagnosticPool(other ? other->DiagnosticPool.getParent() : nullptr) { if (other) { DiagnosticPool.steal(other->DiagnosticPool); other->abort(); @@ -137,7 +137,7 @@ namespace clang { /// Signals that the context was completed without an appropriate /// declaration being parsed. void abort() { - pop(0); + pop(nullptr); } void complete(Decl *D) { @@ -148,7 +148,7 @@ namespace clang { /// Unregister this object from Sema, but remember all the /// diagnostics that were emitted into it. void abortAndRemember() { - pop(0); + pop(nullptr); } private: @@ -415,8 +415,8 @@ namespace clang { return diagnoseOverflow(); } - - bool expectAndConsume(unsigned DiagID, + + bool expectAndConsume(unsigned DiagID = diag::err_expected, const char *Msg = "", tok::TokenKind SkipToTok = tok::unknown); bool consumeClose() { |
