OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Prospective MSVC 2010 build fix 

Try to fix Compiler Error C2011 following r198607 by removing enum from 'enum
TokenKind' parameter types.

llvm-svn: 198621
This commit is contained in:
Alp Toker 2014-01-06 15:52:13 +00:00
parent a889636aa0
commit b3f9501b25
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Basic/TokenKinds.h
View File

@ -54,7 +54,7 @@ enum OnOffSwitch {
/// ///
/// The name of a token will be an internal name (such as "l_square") /// The name of a token will be an internal name (such as "l_square")
/// and should not be used as part of diagnostic messages. /// and should not be used as part of diagnostic messages.
const char *getTokenName(enum TokenKind Kind) LLVM_READNONE; const char *getTokenName(TokenKind Kind) LLVM_READNONE;
/// \brief Determines the spelling of simple punctuation tokens like /// \brief Determines the spelling of simple punctuation tokens like
/// '!' or '%', and returns NULL for literal and annotation tokens. /// '!' or '%', and returns NULL for literal and annotation tokens.
@ -63,11 +63,11 @@ const char *getTokenName(enum TokenKind Kind) LLVM_READNONE;
/// and will not produce any alternative spellings (e.g., a /// and will not produce any alternative spellings (e.g., a
/// digraph). For the actual spelling of a given Token, use /// digraph). For the actual spelling of a given Token, use
/// Preprocessor::getSpelling(). /// Preprocessor::getSpelling().
const char *getPunctuatorSpelling(enum TokenKind Kind) LLVM_READNONE; const char *getPunctuatorSpelling(TokenKind Kind) LLVM_READNONE;
/// \brief Determines the spelling of simple keyword and contextual keyword /// \brief Determines the spelling of simple keyword and contextual keyword
/// tokens like 'int' and 'dynamic_cast'. Returns NULL for other token kinds. /// tokens like 'int' and 'dynamic_cast'. Returns NULL for other token kinds.
const char *getKeywordSpelling(enum TokenKind Kind) LLVM_READNONE; const char *getKeywordSpelling(TokenKind Kind) LLVM_READNONE;
/// \brief Return true if this is a raw identifier or an identifier kind. /// \brief Return true if this is a raw identifier or an identifier kind.
inline bool isAnyIdentifier(TokenKind K) { inline bool isAnyIdentifier(TokenKind K) {

6
clang/lib/Basic/TokenKinds.cpp
View File

@ -22,14 +22,14 @@ static const char * const TokNames[] = {
0 0
}; };
const char *tok::getTokenName(enum TokenKind Kind) { const char *tok::getTokenName(TokenKind Kind) {
if (Kind < tok::NUM_TOKENS) if (Kind < tok::NUM_TOKENS)
return TokNames[Kind]; return TokNames[Kind];
llvm_unreachable("unknown TokenKind"); llvm_unreachable("unknown TokenKind");
return 0; return 0;
} }
const char *tok::getPunctuatorSpelling(enum TokenKind Kind) { const char *tok::getPunctuatorSpelling(TokenKind Kind) {
switch (Kind) { switch (Kind) {
#define PUNCTUATOR(X,Y) case X: return Y; #define PUNCTUATOR(X,Y) case X: return Y;
#include "clang/Basic/TokenKinds.def" #include "clang/Basic/TokenKinds.def"
@ -38,7 +38,7 @@ const char *tok::getPunctuatorSpelling(enum TokenKind Kind) {
return 0; return 0;
} }
const char *tok::getKeywordSpelling(enum TokenKind Kind) { const char *tok::getKeywordSpelling(TokenKind Kind) {
switch (Kind) { switch (Kind) {
#define KEYWORD(X,Y) case kw_ ## X: return #X; #define KEYWORD(X,Y) case kw_ ## X: return #X;
#include "clang/Basic/TokenKinds.def" #include "clang/Basic/TokenKinds.def"