maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Sort the type traits in a few places where they weren't previously 

sorted in order to prepare for adding some new ones.

llvm-svn: 130056
This commit is contained in:
Chandler Carruth 2011-04-23 10:47:20 +00:00
parent 61fbf62838
commit 7980348fcf
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/TokenKinds.def
View File

@ -336,11 +336,11 @@ KEYWORD(__is_class , KEYCXX)
KEYWORD(__is_convertible_to , KEYCXX)
KEYWORD(__is_empty , KEYCXX)
KEYWORD(__is_enum , KEYCXX)
// Tentative name - there's no implementation of std::is_literal_type yet.
KEYWORD(__is_literal , KEYCXX)
KEYWORD(__is_pod , KEYCXX)
KEYWORD(__is_polymorphic , KEYCXX)
KEYWORD(__is_union , KEYCXX)
// Tentative name - there's no implementation of std::is_literal_type yet.
KEYWORD(__is_literal , KEYCXX)
// Apple Extension.
KEYWORD(__private_extern__ , KEYALL)

4
clang/include/clang/Basic/TypeTraits.h
View File

@ -30,10 +30,10 @@ namespace clang {
UTT_IsClass,
UTT_IsEmpty,
UTT_IsEnum,
UTT_IsLiteral,
UTT_IsPOD,
UTT_IsPolymorphic,
UTT_IsUnion,
UTT_IsLiteral
UTT_IsUnion
};
/// BinaryTypeTrait - Names for the binary type traits.

2
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -587,10 +587,10 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
.Case("is_convertible_to", LangOpts.CPlusPlus)
.Case("is_empty", LangOpts.CPlusPlus)
.Case("is_enum", LangOpts.CPlusPlus)
.Case("is_literal", LangOpts.CPlusPlus)
.Case("is_pod", LangOpts.CPlusPlus)
.Case("is_polymorphic", LangOpts.CPlusPlus)
.Case("is_union", LangOpts.CPlusPlus)
.Case("is_literal", LangOpts.CPlusPlus)
.Case("tls", PP.getTargetInfo().isTLSSupported())
.Default(false);
}

10
clang/lib/Parse/ParseExpr.cpp
View File

@ -983,14 +983,14 @@ ExprResult Parser::ParseCastExpression(bool isUnaryExpression,
return move(Result);
}
case tok::kw___is_pod: // [GNU] unary-type-trait
case tok::kw___is_abstract: // [GNU] unary-type-trait
case tok::kw___is_class:
case tok::kw___is_enum:
case tok::kw___is_union:
case tok::kw___is_empty:
case tok::kw___is_polymorphic:
case tok::kw___is_abstract:
case tok::kw___is_enum:
case tok::kw___is_literal:
case tok::kw___is_pod:
case tok::kw___is_polymorphic:
case tok::kw___is_union:
case tok::kw___has_trivial_constructor:
case tok::kw___has_trivial_copy:
case tok::kw___has_trivial_assign:

2
clang/lib/Parse/ParseExprCXX.cpp
View File

@ -1926,10 +1926,10 @@ static UnaryTypeTrait UnaryTypeTraitFromTokKind(tok::TokenKind kind) {
case tok::kw___is_class: return UTT_IsClass;
case tok::kw___is_empty: return UTT_IsEmpty;
case tok::kw___is_enum: return UTT_IsEnum;
case tok::kw___is_literal: return UTT_IsLiteral;
case tok::kw___is_pod: return UTT_IsPOD;
case tok::kw___is_polymorphic: return UTT_IsPolymorphic;
case tok::kw___is_union: return UTT_IsUnion;
case tok::kw___is_literal: return UTT_IsLiteral;
}
}

2
clang/lib/Parse/ParseTentative.cpp
View File

@ -659,10 +659,10 @@ Parser::isExpressionOrTypeSpecifierSimple(tok::TokenKind Kind) {
case tok::kw___is_convertible_to:
case tok::kw___is_empty:
case tok::kw___is_enum:
case tok::kw___is_literal:
case tok::kw___is_pod:
case tok::kw___is_polymorphic:
case tok::kw___is_union:
case tok::kw___is_literal:
case tok::kw___uuidof:
return TPResult::True();