Author: ygao Date: Tue May 6 20:58:02 2014 New Revision: 208147 URL: http://llvm.org/viewvc/llvm-project?rev=208147&view=rev Log: Clean up some existing keyword tests in the test/Lexer directory by using the pre-defined __is_identifier() macro.
Differential Revision: http://reviews.llvm.org/D3460 Added: cfe/trunk/test/Lexer/keywords_test.cpp Removed: cfe/trunk/test/Lexer/clang-keywords.cpp cfe/trunk/test/Lexer/cxx0x_keyword.cpp cfe/trunk/test/Lexer/gnu_keywords.c Removed: cfe/trunk/test/Lexer/clang-keywords.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/clang-keywords.cpp?rev=208146&view=auto ============================================================================== --- cfe/trunk/test/Lexer/clang-keywords.cpp (original) +++ cfe/trunk/test/Lexer/clang-keywords.cpp (removed) @@ -1,4 +0,0 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s -// expected-no-diagnostics -__char16_t c16; -void f(__char32_t) { } Removed: cfe/trunk/test/Lexer/cxx0x_keyword.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cxx0x_keyword.cpp?rev=208146&view=auto ============================================================================== --- cfe/trunk/test/Lexer/cxx0x_keyword.cpp (original) +++ cfe/trunk/test/Lexer/cxx0x_keyword.cpp (removed) @@ -1,2 +0,0 @@ -// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s 2>&1 -int static_assert; /* expected-error {{expected unqualified-id}} */ Removed: cfe/trunk/test/Lexer/gnu_keywords.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/gnu_keywords.c?rev=208146&view=auto ============================================================================== --- cfe/trunk/test/Lexer/gnu_keywords.c (original) +++ cfe/trunk/test/Lexer/gnu_keywords.c (removed) @@ -1,13 +0,0 @@ -// RUN: %clang_cc1 -DGNU_KEYWORDS -std=gnu89 -fsyntax-only -verify %s -// RUN: %clang_cc1 -DGNU_KEYWORDS -std=c99 -fgnu-keywords -fsyntax-only -verify %s -// RUN: %clang_cc1 -std=c99 -fsyntax-only -verify %s -// RUN: %clang_cc1 -std=gnu89 -fno-gnu-keywords -fsyntax-only -verify %s -// expected-no-diagnostics - -void f() { -#ifdef GNU_KEYWORDS - asm ("ret" : :); -#else - int asm; -#endif -} Added: cfe/trunk/test/Lexer/keywords_test.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/keywords_test.cpp?rev=208147&view=auto ============================================================================== --- cfe/trunk/test/Lexer/keywords_test.cpp (added) +++ cfe/trunk/test/Lexer/keywords_test.cpp Tue May 6 20:58:02 2014 @@ -0,0 +1,34 @@ +// RUN: %clang_cc1 -std=c++03 -fsyntax-only %s +// RUN: %clang_cc1 -std=c++11 -DCXX11 -fsyntax-only %s + +#define IS_KEYWORD(NAME) _Static_assert(!__is_identifier(NAME), #NAME) +#define NOT_KEYWORD(NAME) _Static_assert(__is_identifier(NAME), #NAME) +#define IS_TYPE(NAME) void is_##NAME##_type() { int f(NAME); } + +#ifdef CXX11 +#define CXX11_KEYWORD(NAME) IS_KEYWORD(NAME) +#define CXX11_TYPE(NAME) IS_TYPE(NAME) +#else +#define CXX11_KEYWORD(NAME) NOT_KEYWORD(NAME) +#define CXX11_TYPE(NAME) +#endif + +// C++11 keywords +CXX11_KEYWORD(nullptr); +CXX11_KEYWORD(decltype); +CXX11_KEYWORD(alignof); +CXX11_KEYWORD(alignas); +CXX11_KEYWORD(char16_t); +CXX11_TYPE(char16_t); +CXX11_KEYWORD(char32_t); +CXX11_TYPE(char32_t); +CXX11_KEYWORD(constexpr); +CXX11_KEYWORD(noexcept); +CXX11_KEYWORD(static_assert); +CXX11_KEYWORD(thread_local); + +// Clang extension +IS_KEYWORD(__char16_t); +IS_TYPE(__char16_t); +IS_KEYWORD(__char32_t); +IS_TYPE(__char32_t); _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
