Clean up some existing keyword tests in the test/Lexer directory

[ygao]

Summary

Hi,
I am trying to clean up the existing keyword tests in the test/Lexer directory by using the
pre-defined __is_identifier() macro:

1. Merge the contents of cxx0x_keyword.cpp and clang-keywords.cpp into a new file keywords_test.cpp
2. Remove gnu_keywords.c because the contents of this file is already merged into keywords_test.c

Can someone take a look whether this change looks reasonable?

• Gao

[ygao]

A gentle ping?

[rsmith]

FYI, Phabricator doesn't send mail when you change the CC's on a review, so no-one was informed that this change existed until just now.

LGTM, thanks!

test/Lexer/keywords_test.cpp

4–5

It might be nice to also have an IS_TYPE, and check there that tentative parsing knows that the keyword is a type. Something like:

#define IS_TYPE(NAME) void is_##TYPE##_type() { int(f(TYPE)); } // ok, function declaration

test/Lexer/clang-keywords.cpp

-// RUN: %clang_cc1 -fsyntax-only -verify %s
-// expected-no-diagnostics
-__char16_t c16;
-void f(__char32_t) { }

test/Lexer/cxx0x_keyword.cpp

-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s 2>&1
-int static_assert; /* expected-error {{expected unqualified-id}} */

test/Lexer/gnu_keywords.c

-// 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
-}

test/Lexer/keywords_test.cpp

+// 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)
+
+#ifdef CXX11
+#define CXX11_KEYWORD(NAME)  IS_KEYWORD(NAME)
+#else
+#define CXX11_KEYWORD(NAME)  NOT_KEYWORD(NAME)
+#endif
+
+// C++11 keywords
+CXX11_KEYWORD(nullptr);
+CXX11_KEYWORD(decltype);
+CXX11_KEYWORD(alignof);
+CXX11_KEYWORD(alignas);
+CXX11_KEYWORD(char16_t);
+CXX11_KEYWORD(char32_t);
+CXX11_KEYWORD(constexpr);
+CXX11_KEYWORD(noexcept);
+CXX11_KEYWORD(static_assert);
+CXX11_KEYWORD(thread_local);
+
+// Clang extension
+IS_KEYWORD(__char16_t);
+IS_KEYWORD(__char32_t);