diff options
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 5 | ||||
| -rw-r--r-- | test/Lexer/clang-keywords.cpp | 3 | ||||
| -rw-r--r-- | test/Lexer/cxx0x_keyword_as_cxx98.cpp | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index 9fd3c753fb..8e06534641 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -381,6 +381,11 @@ ALIAS("_uuidof" , __uuidof , KEYMS | KEYBORLAND) // Borland Extensions which should be disabled in strict conformance mode. ALIAS("_pascal" , __pascal , KEYBORLAND) +// Clang Extensions. +ALIAS("__char16_t" , char16_t , KEYCXX) +ALIAS("__char32_t" , char32_t , KEYCXX) + + //===----------------------------------------------------------------------===// // Objective-C @-preceeded keywords. //===----------------------------------------------------------------------===// diff --git a/test/Lexer/clang-keywords.cpp b/test/Lexer/clang-keywords.cpp new file mode 100644 index 0000000000..a349b44ade --- /dev/null +++ b/test/Lexer/clang-keywords.cpp @@ -0,0 +1,3 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +__char16_t c16; +void f(__char32_t) { } diff --git a/test/Lexer/cxx0x_keyword_as_cxx98.cpp b/test/Lexer/cxx0x_keyword_as_cxx98.cpp index 2bfb8b0b93..0223b039be 100644 --- a/test/Lexer/cxx0x_keyword_as_cxx98.cpp +++ b/test/Lexer/cxx0x_keyword_as_cxx98.cpp @@ -1,2 +1,3 @@ -// RUN: %clang_cc1 %s -fsyntax-only +// RUN: %clang_cc1 %s -verify -fsyntax-only int static_assert; +int char16_t; |