diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 09:15:30 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 09:15:30 +0000 |
commit | 9f4dbff6669c8037f3b036bcf580d14f1a4f12a5 (patch) | |
tree | 47df2c12b57214af6c31e47404b005675b8b7ffc /lib/Basic/TokenKinds.cpp | |
parent | f73d5f23a889b93d89ddef61ac0995df40286bb8 (diff) | |
download | src-9f4dbff6669c8037f3b036bcf580d14f1a4f12a5.tar.gz src-9f4dbff6669c8037f3b036bcf580d14f1a4f12a5.zip |
Vendor import of clang RELEASE_350/final tag r216957 (effectively, 3.5.0 release):vendor/clang/clang-release_350-r216957
Notes
Notes:
svn path=/vendor/clang/dist/; revision=274958
svn path=/vendor/clang/clang-release_350-r216957/; revision=274959; tag=vendor/clang/clang-release_350-r216957
Diffstat (limited to 'lib/Basic/TokenKinds.cpp')
-rw-r--r-- | lib/Basic/TokenKinds.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/Basic/TokenKinds.cpp b/lib/Basic/TokenKinds.cpp index 6ce076e57a6c..3b1f8fe34bef 100644 --- a/lib/Basic/TokenKinds.cpp +++ b/lib/Basic/TokenKinds.cpp @@ -12,27 +12,37 @@ //===----------------------------------------------------------------------===// #include "clang/Basic/TokenKinds.h" -#include <cassert> +#include "llvm/Support/ErrorHandling.h" using namespace clang; static const char * const TokNames[] = { #define TOK(X) #X, #define KEYWORD(X,Y) #X, #include "clang/Basic/TokenKinds.def" - 0 + nullptr }; -const char *tok::getTokenName(enum TokenKind Kind) { - assert(Kind < tok::NUM_TOKENS); - return TokNames[Kind]; +const char *tok::getTokenName(TokenKind Kind) { + if (Kind < tok::NUM_TOKENS) + return TokNames[Kind]; + llvm_unreachable("unknown TokenKind"); + return nullptr; } -const char *tok::getTokenSimpleSpelling(enum TokenKind Kind) { +const char *tok::getPunctuatorSpelling(TokenKind Kind) { switch (Kind) { #define PUNCTUATOR(X,Y) case X: return Y; #include "clang/Basic/TokenKinds.def" default: break; } + return nullptr; +} - return 0; +const char *tok::getKeywordSpelling(TokenKind Kind) { + switch (Kind) { +#define KEYWORD(X,Y) case kw_ ## X: return #X; +#include "clang/Basic/TokenKinds.def" + default: break; + } + return nullptr; } |