[clang] 4e80636 - Implement P1949
Aaron Ballman via cfe-commits
cfe-commits at lists.llvm.org
Wed Aug 18 04:35:11 PDT 2021
Author: Corentin Jabot
Date: 2021-08-18T07:33:14-04:00
New Revision: 4e80636db71a1b6123d15ed1f9eda3979b4292de
URL: https://github.com/llvm/llvm-project/commit/4e80636db71a1b6123d15ed1f9eda3979b4292de
DIFF: https://github.com/llvm/llvm-project/commit/4e80636db71a1b6123d15ed1f9eda3979b4292de.diff
LOG: Implement P1949
This adds the Unicode 13 data for XID_Start and XID_Continue.
The definition of valid identifier is changed in all C++ modes
as P1949 (https://wg21.link/p1949) was accepted by WG21 as a defect
report.
Added:
Modified:
clang/include/clang/Basic/CharInfo.h
clang/include/clang/Basic/DiagnosticLexKinds.td
clang/lib/Lex/Lexer.cpp
clang/lib/Lex/UnicodeCharSets.h
clang/test/CXX/drs/dr1xx.cpp
clang/test/CXX/drs/dr2xx.cpp
clang/test/CXX/drs/dr6xx.cpp
clang/test/FixIt/fixit-unicode.c
clang/test/Lexer/unicode.c
clang/test/Parser/cxx11-user-defined-literals.cpp
clang/test/Preprocessor/assembler-with-cpp.c
clang/test/Preprocessor/ucn-allowed-chars.c
clang/test/Preprocessor/utf8-allowed-chars.c
clang/www/cxx_dr_status.html
clang/www/cxx_status.html
clang/www/make_cxx_dr_status
Removed:
################################################################################
diff --git a/clang/include/clang/Basic/CharInfo.h b/clang/include/clang/Basic/CharInfo.h
index 8577475fab069..472eb38b9829d 100644
--- a/clang/include/clang/Basic/CharInfo.h
+++ b/clang/include/clang/Basic/CharInfo.h
@@ -43,6 +43,11 @@ LLVM_READNONE inline bool isASCII(char c) {
return static_cast<unsigned char>(c) <= 127;
}
+LLVM_READNONE inline bool isASCII(unsigned char c) { return c <= 127; }
+
+/// Returns true if this is an ASCII character.
+LLVM_READNONE inline bool isASCII(uint32_t c) { return c <= 127; }
+
/// Returns true if this is a valid first character of a C identifier,
/// which is [a-zA-Z_].
LLVM_READONLY inline bool isIdentifierHead(unsigned char c,
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td
index f621cdb466560..45a5b62af461a 100644
--- a/clang/include/clang/Basic/DiagnosticLexKinds.td
+++ b/clang/include/clang/Basic/DiagnosticLexKinds.td
@@ -113,8 +113,10 @@ def warn_four_char_character_literal : Warning<
// Unicode and UCNs
def err_invalid_utf8 : Error<
"source file is not valid UTF-8">;
-def err_non_ascii : Error<
- "non-ASCII characters are not allowed outside of literals and identifiers">;
+def err_character_not_allowed : Error<
+ "unexpected character <U+%0>">;
+def err_character_not_allowed_identifier : Error<
+ "character <U+%0> not allowed %select{in|at the start of}1 an identifier">;
def ext_unicode_whitespace : ExtWarn<
"treating Unicode character as whitespace">,
InGroup<DiagGroup<"unicode-whitespace">>;
@@ -150,9 +152,6 @@ def warn_c99_compat_unicode_id : Warning<
"%select{using this character in an identifier|starting an identifier with "
"this character}0 is incompatible with C99">,
InGroup<C99Compat>, DefaultIgnore;
-def warn_cxx98_compat_unicode_id : Warning<
- "using this character in an identifier is incompatible with C++98">,
- InGroup<CXX98Compat>, DefaultIgnore;
def warn_cxx98_compat_literal_ucn_escape_basic_scs : Warning<
"specifying character '%0' with a universal character name "
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 64944492eb99b..d1555b47dbd0d 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -1446,19 +1446,30 @@ void Lexer::SetByteOffset(unsigned Offset, bool StartOfLine) {
IsAtPhysicalStartOfLine = StartOfLine;
}
+static bool isUnicodeWhitespace(uint32_t Codepoint) {
+ static const llvm::sys::UnicodeCharSet UnicodeWhitespaceChars(
+ UnicodeWhitespaceCharRanges);
+ return UnicodeWhitespaceChars.contains(Codepoint);
+}
+
static bool isAllowedIDChar(uint32_t C, const LangOptions &LangOpts) {
if (LangOpts.AsmPreprocessor) {
return false;
} else if (LangOpts.DollarIdents && '$' == C) {
return true;
- } else if (LangOpts.CPlusPlus11 || LangOpts.C11) {
+ } else if (LangOpts.CPlusPlus) {
+ // A non-leading codepoint must have the XID_Continue property.
+ // XIDContinueRanges doesn't contains characters also in XIDStartRanges,
+ // so we need to check both tables.
+ // '_' doesn't have the XID_Continue property but is allowed in C++.
+ static const llvm::sys::UnicodeCharSet XIDStartChars(XIDStartRanges);
+ static const llvm::sys::UnicodeCharSet XIDContinueChars(XIDContinueRanges);
+ return C == '_' || XIDStartChars.contains(C) ||
+ XIDContinueChars.contains(C);
+ } else if (LangOpts.C11) {
static const llvm::sys::UnicodeCharSet C11AllowedIDChars(
C11AllowedIDCharRanges);
return C11AllowedIDChars.contains(C);
- } else if (LangOpts.CPlusPlus) {
- static const llvm::sys::UnicodeCharSet CXX03AllowedIDChars(
- CXX03AllowedIDCharRanges);
- return CXX03AllowedIDChars.contains(C);
} else {
static const llvm::sys::UnicodeCharSet C99AllowedIDChars(
C99AllowedIDCharRanges);
@@ -1467,20 +1478,24 @@ static bool isAllowedIDChar(uint32_t C, const LangOptions &LangOpts) {
}
static bool isAllowedInitiallyIDChar(uint32_t C, const LangOptions &LangOpts) {
- assert(isAllowedIDChar(C, LangOpts));
if (LangOpts.AsmPreprocessor) {
return false;
- } else if (LangOpts.CPlusPlus11 || LangOpts.C11) {
+ }
+ if (LangOpts.CPlusPlus) {
+ static const llvm::sys::UnicodeCharSet XIDStartChars(XIDStartRanges);
+ // '_' doesn't have the XID_Start property but is allowed in C++.
+ return C == '_' || XIDStartChars.contains(C);
+ }
+ if (!isAllowedIDChar(C, LangOpts))
+ return false;
+ if (LangOpts.C11) {
static const llvm::sys::UnicodeCharSet C11DisallowedInitialIDChars(
C11DisallowedInitialIDCharRanges);
return !C11DisallowedInitialIDChars.contains(C);
- } else if (LangOpts.CPlusPlus) {
- return true;
- } else {
- static const llvm::sys::UnicodeCharSet C99DisallowedInitialIDChars(
- C99DisallowedInitialIDCharRanges);
- return !C99DisallowedInitialIDChars.contains(C);
}
+ static const llvm::sys::UnicodeCharSet C99DisallowedInitialIDChars(
+ C99DisallowedInitialIDCharRanges);
+ return !C99DisallowedInitialIDChars.contains(C);
}
static inline CharSourceRange makeCharRange(Lexer &L, const char *Begin,
@@ -1512,16 +1527,6 @@ static void maybeDiagnoseIDCharCompat(DiagnosticsEngine &Diags, uint32_t C,
<< CannotStartIdentifier;
}
}
-
- // Check C++98 compatibility.
- if (!Diags.isIgnored(diag::warn_cxx98_compat_unicode_id, Range.getBegin())) {
- static const llvm::sys::UnicodeCharSet CXX03AllowedIDChars(
- CXX03AllowedIDCharRanges);
- if (!CXX03AllowedIDChars.contains(C)) {
- Diags.Report(Range.getBegin(), diag::warn_cxx98_compat_unicode_id)
- << Range;
- }
- }
}
/// After encountering UTF-8 character C and interpreting it as an identifier
@@ -1608,14 +1613,55 @@ static void maybeDiagnoseUTF8Homoglyph(DiagnosticsEngine &Diags, uint32_t C,
}
}
+static void diagnoseInvalidUnicodeCodepointInIdentifier(
+ DiagnosticsEngine &Diags, const LangOptions &LangOpts, uint32_t CodePoint,
+ CharSourceRange Range, bool IsFirst) {
+ if (isASCII(CodePoint))
+ return;
+
+ bool IsIDStart = isAllowedInitiallyIDChar(CodePoint, LangOpts);
+ bool IsIDContinue = IsIDStart || isAllowedIDChar(CodePoint, LangOpts);
+
+ if ((IsFirst && IsIDStart) || (!IsFirst && IsIDContinue))
+ return;
+
+ bool InvalidOnlyAtStart = IsFirst && !IsIDStart && IsIDContinue;
+
+ llvm::SmallString<5> CharBuf;
+ llvm::raw_svector_ostream CharOS(CharBuf);
+ llvm::write_hex(CharOS, CodePoint, llvm::HexPrintStyle::Upper, 4);
+
+ if (!IsFirst || InvalidOnlyAtStart) {
+ Diags.Report(Range.getBegin(), diag::err_character_not_allowed_identifier)
+ << Range << CharBuf << int(InvalidOnlyAtStart)
+ << FixItHint::CreateRemoval(Range);
+ } else {
+ Diags.Report(Range.getBegin(), diag::err_character_not_allowed)
+ << Range << CharBuf << FixItHint::CreateRemoval(Range);
+ }
+}
+
bool Lexer::tryConsumeIdentifierUCN(const char *&CurPtr, unsigned Size,
Token &Result) {
const char *UCNPtr = CurPtr + Size;
uint32_t CodePoint = tryReadUCN(UCNPtr, CurPtr, /*Token=*/nullptr);
- if (CodePoint == 0 || !isAllowedIDChar(CodePoint, LangOpts))
+ if (CodePoint == 0) {
return false;
+ }
- if (!isLexingRawMode())
+ if (!isAllowedIDChar(CodePoint, LangOpts)) {
+ if (isASCII(CodePoint) || isUnicodeWhitespace(CodePoint))
+ return false;
+ if (!isLexingRawMode())
+ diagnoseInvalidUnicodeCodepointInIdentifier(
+ PP->getDiagnostics(), LangOpts, CodePoint,
+ makeCharRange(*this, CurPtr, UCNPtr),
+ /*IsFirst=*/false);
+
+ // We got a unicode codepoint that is neither a space nor a
+ // a valid identifier part.
+ // Carry on as if the codepoint was valid for recovery purposes.
+ } else if (!isLexingRawMode())
maybeDiagnoseIDCharCompat(PP->getDiagnostics(), CodePoint,
makeCharRange(*this, CurPtr, UCNPtr),
/*IsFirst=*/false);
@@ -1638,11 +1684,21 @@ bool Lexer::tryConsumeIdentifierUTF8Char(const char *&CurPtr) {
(const llvm::UTF8 *)BufferEnd,
&CodePoint,
llvm::strictConversion);
- if (Result != llvm::conversionOK ||
- !isAllowedIDChar(static_cast<uint32_t>(CodePoint), LangOpts))
+ if (Result != llvm::conversionOK)
return false;
- if (!isLexingRawMode()) {
+ if (!isAllowedIDChar(static_cast<uint32_t>(CodePoint), LangOpts)) {
+ if (isASCII(CodePoint) || isUnicodeWhitespace(CodePoint))
+ return false;
+
+ if (!isLexingRawMode())
+ diagnoseInvalidUnicodeCodepointInIdentifier(
+ PP->getDiagnostics(), LangOpts, CodePoint,
+ makeCharRange(*this, CurPtr, UnicodePtr), /*IsFirst=*/false);
+ // We got a unicode codepoint that is neither a space nor a
+ // a valid identifier part. Carry on as if the codepoint was
+ // valid for recovery purposes.
+ } else if (!isLexingRawMode()) {
maybeDiagnoseIDCharCompat(PP->getDiagnostics(), CodePoint,
makeCharRange(*this, CurPtr, UnicodePtr),
/*IsFirst=*/false);
@@ -3136,10 +3192,8 @@ uint32_t Lexer::tryReadUCN(const char *&StartPtr, const char *SlashLoc,
bool Lexer::CheckUnicodeWhitespace(Token &Result, uint32_t C,
const char *CurPtr) {
- static const llvm::sys::UnicodeCharSet UnicodeWhitespaceChars(
- UnicodeWhitespaceCharRanges);
if (!isLexingRawMode() && !PP->isPreprocessedOutput() &&
- UnicodeWhitespaceChars.contains(C)) {
+ isUnicodeWhitespace(C)) {
Diag(BufferPtr, diag::ext_unicode_whitespace)
<< makeCharRange(*this, BufferPtr, CurPtr);
@@ -3150,7 +3204,7 @@ bool Lexer::CheckUnicodeWhitespace(Token &Result, uint32_t C,
}
bool Lexer::LexUnicode(Token &Result, uint32_t C, const char *CurPtr) {
- if (isAllowedIDChar(C, LangOpts) && isAllowedInitiallyIDChar(C, LangOpts)) {
+ if (isAllowedInitiallyIDChar(C, LangOpts)) {
if (!isLexingRawMode() && !ParsingPreprocessorDirective &&
!PP->isPreprocessedOutput()) {
maybeDiagnoseIDCharCompat(PP->getDiagnostics(), C,
@@ -3165,8 +3219,8 @@ bool Lexer::LexUnicode(Token &Result, uint32_t C, const char *CurPtr) {
}
if (!isLexingRawMode() && !ParsingPreprocessorDirective &&
- !PP->isPreprocessedOutput() &&
- !isASCII(*BufferPtr) && !isAllowedIDChar(C, LangOpts)) {
+ !PP->isPreprocessedOutput() && !isASCII(*BufferPtr) &&
+ !isAllowedInitiallyIDChar(C, LangOpts) && !isUnicodeWhitespace(C)) {
// Non-ASCII characters tend to creep into source code unintentionally.
// Instead of letting the parser complain about the unknown token,
// just drop the character.
@@ -3176,9 +3230,9 @@ bool Lexer::LexUnicode(Token &Result, uint32_t C, const char *CurPtr) {
// loophole in the mapping of Unicode characters to basic character set
// characters that allows us to map these particular characters to, say,
// whitespace.
- Diag(BufferPtr, diag::err_non_ascii)
- << FixItHint::CreateRemoval(makeCharRange(*this, BufferPtr, CurPtr));
-
+ diagnoseInvalidUnicodeCodepointInIdentifier(
+ PP->getDiagnostics(), LangOpts, C,
+ makeCharRange(*this, BufferPtr, CurPtr), /*IsStart*/ true);
BufferPtr = CurPtr;
return false;
}
diff --git a/clang/lib/Lex/UnicodeCharSets.h b/clang/lib/Lex/UnicodeCharSets.h
index 74dd57fdf1184..33fb4d39ebec2 100644
--- a/clang/lib/Lex/UnicodeCharSets.h
+++ b/clang/lib/Lex/UnicodeCharSets.h
@@ -10,6 +10,344 @@
#include "llvm/Support/UnicodeCharRanges.h"
+// Unicode 13 XID_Start
+static const llvm::sys::UnicodeCharRange XIDStartRanges[] = {
+ {0x0041, 0x005A}, {0x0061, 0x007A}, {0x00AA, 0x00AA},
+ {0x00B5, 0x00B5}, {0x00BA, 0x00BA}, {0x00C0, 0x00D6},
+ {0x00D8, 0x00F6}, {0x00F8, 0x02C1}, {0x02C6, 0x02D1},
+ {0x02E0, 0x02E4}, {0x02EC, 0x02EC}, {0x02EE, 0x02EE},
+ {0x0370, 0x0374}, {0x0376, 0x0377}, {0x037B, 0x037D},
+ {0x037F, 0x037F}, {0x0386, 0x0386}, {0x0388, 0x038A},
+ {0x038C, 0x038C}, {0x038E, 0x03A1}, {0x03A3, 0x03F5},
+ {0x03F7, 0x0481}, {0x048A, 0x052F}, {0x0531, 0x0556},
+ {0x0559, 0x0559}, {0x0560, 0x0588}, {0x05D0, 0x05EA},
+ {0x05EF, 0x05F2}, {0x0620, 0x064A}, {0x066E, 0x066F},
+ {0x0671, 0x06D3}, {0x06D5, 0x06D5}, {0x06E5, 0x06E6},
+ {0x06EE, 0x06EF}, {0x06FA, 0x06FC}, {0x06FF, 0x06FF},
+ {0x0710, 0x0710}, {0x0712, 0x072F}, {0x074D, 0x07A5},
+ {0x07B1, 0x07B1}, {0x07CA, 0x07EA}, {0x07F4, 0x07F5},
+ {0x07FA, 0x07FA}, {0x0800, 0x0815}, {0x081A, 0x081A},
+ {0x0824, 0x0824}, {0x0828, 0x0828}, {0x0840, 0x0858},
+ {0x0860, 0x086A}, {0x08A0, 0x08B4}, {0x08B6, 0x08C7},
+ {0x0904, 0x0939}, {0x093D, 0x093D}, {0x0950, 0x0950},
+ {0x0958, 0x0961}, {0x0971, 0x0980}, {0x0985, 0x098C},
+ {0x098F, 0x0990}, {0x0993, 0x09A8}, {0x09AA, 0x09B0},
+ {0x09B2, 0x09B2}, {0x09B6, 0x09B9}, {0x09BD, 0x09BD},
+ {0x09CE, 0x09CE}, {0x09DC, 0x09DD}, {0x09DF, 0x09E1},
+ {0x09F0, 0x09F1}, {0x09FC, 0x09FC}, {0x0A05, 0x0A0A},
+ {0x0A0F, 0x0A10}, {0x0A13, 0x0A28}, {0x0A2A, 0x0A30},
+ {0x0A32, 0x0A33}, {0x0A35, 0x0A36}, {0x0A38, 0x0A39},
+ {0x0A59, 0x0A5C}, {0x0A5E, 0x0A5E}, {0x0A72, 0x0A74},
+ {0x0A85, 0x0A8D}, {0x0A8F, 0x0A91}, {0x0A93, 0x0AA8},
+ {0x0AAA, 0x0AB0}, {0x0AB2, 0x0AB3}, {0x0AB5, 0x0AB9},
+ {0x0ABD, 0x0ABD}, {0x0AD0, 0x0AD0}, {0x0AE0, 0x0AE1},
+ {0x0AF9, 0x0AF9}, {0x0B05, 0x0B0C}, {0x0B0F, 0x0B10},
+ {0x0B13, 0x0B28}, {0x0B2A, 0x0B30}, {0x0B32, 0x0B33},
+ {0x0B35, 0x0B39}, {0x0B3D, 0x0B3D}, {0x0B5C, 0x0B5D},
+ {0x0B5F, 0x0B61}, {0x0B71, 0x0B71}, {0x0B83, 0x0B83},
+ {0x0B85, 0x0B8A}, {0x0B8E, 0x0B90}, {0x0B92, 0x0B95},
+ {0x0B99, 0x0B9A}, {0x0B9C, 0x0B9C}, {0x0B9E, 0x0B9F},
+ {0x0BA3, 0x0BA4}, {0x0BA8, 0x0BAA}, {0x0BAE, 0x0BB9},
+ {0x0BD0, 0x0BD0}, {0x0C05, 0x0C0C}, {0x0C0E, 0x0C10},
+ {0x0C12, 0x0C28}, {0x0C2A, 0x0C39}, {0x0C3D, 0x0C3D},
+ {0x0C58, 0x0C5A}, {0x0C60, 0x0C61}, {0x0C80, 0x0C80},
+ {0x0C85, 0x0C8C}, {0x0C8E, 0x0C90}, {0x0C92, 0x0CA8},
+ {0x0CAA, 0x0CB3}, {0x0CB5, 0x0CB9}, {0x0CBD, 0x0CBD},
+ {0x0CDE, 0x0CDE}, {0x0CE0, 0x0CE1}, {0x0CF1, 0x0CF2},
+ {0x0D04, 0x0D0C}, {0x0D0E, 0x0D10}, {0x0D12, 0x0D3A},
+ {0x0D3D, 0x0D3D}, {0x0D4E, 0x0D4E}, {0x0D54, 0x0D56},
+ {0x0D5F, 0x0D61}, {0x0D7A, 0x0D7F}, {0x0D85, 0x0D96},
+ {0x0D9A, 0x0DB1}, {0x0DB3, 0x0DBB}, {0x0DBD, 0x0DBD},
+ {0x0DC0, 0x0DC6}, {0x0E01, 0x0E30}, {0x0E32, 0x0E32},
+ {0x0E40, 0x0E46}, {0x0E81, 0x0E82}, {0x0E84, 0x0E84},
+ {0x0E86, 0x0E8A}, {0x0E8C, 0x0EA3}, {0x0EA5, 0x0EA5},
+ {0x0EA7, 0x0EB0}, {0x0EB2, 0x0EB2}, {0x0EBD, 0x0EBD},
+ {0x0EC0, 0x0EC4}, {0x0EC6, 0x0EC6}, {0x0EDC, 0x0EDF},
+ {0x0F00, 0x0F00}, {0x0F40, 0x0F47}, {0x0F49, 0x0F6C},
+ {0x0F88, 0x0F8C}, {0x1000, 0x102A}, {0x103F, 0x103F},
+ {0x1050, 0x1055}, {0x105A, 0x105D}, {0x1061, 0x1061},
+ {0x1065, 0x1066}, {0x106E, 0x1070}, {0x1075, 0x1081},
+ {0x108E, 0x108E}, {0x10A0, 0x10C5}, {0x10C7, 0x10C7},
+ {0x10CD, 0x10CD}, {0x10D0, 0x10FA}, {0x10FC, 0x1248},
+ {0x124A, 0x124D}, {0x1250, 0x1256}, {0x1258, 0x1258},
+ {0x125A, 0x125D}, {0x1260, 0x1288}, {0x128A, 0x128D},
+ {0x1290, 0x12B0}, {0x12B2, 0x12B5}, {0x12B8, 0x12BE},
+ {0x12C0, 0x12C0}, {0x12C2, 0x12C5}, {0x12C8, 0x12D6},
+ {0x12D8, 0x1310}, {0x1312, 0x1315}, {0x1318, 0x135A},
+ {0x1380, 0x138F}, {0x13A0, 0x13F5}, {0x13F8, 0x13FD},
+ {0x1401, 0x166C}, {0x166F, 0x167F}, {0x1681, 0x169A},
+ {0x16A0, 0x16EA}, {0x16EE, 0x16F8}, {0x1700, 0x170C},
+ {0x170E, 0x1711}, {0x1720, 0x1731}, {0x1740, 0x1751},
+ {0x1760, 0x176C}, {0x176E, 0x1770}, {0x1780, 0x17B3},
+ {0x17D7, 0x17D7}, {0x17DC, 0x17DC}, {0x1820, 0x1878},
+ {0x1880, 0x18A8}, {0x18AA, 0x18AA}, {0x18B0, 0x18F5},
+ {0x1900, 0x191E}, {0x1950, 0x196D}, {0x1970, 0x1974},
+ {0x1980, 0x19AB}, {0x19B0, 0x19C9}, {0x1A00, 0x1A16},
+ {0x1A20, 0x1A54}, {0x1AA7, 0x1AA7}, {0x1B05, 0x1B33},
+ {0x1B45, 0x1B4B}, {0x1B83, 0x1BA0}, {0x1BAE, 0x1BAF},
+ {0x1BBA, 0x1BE5}, {0x1C00, 0x1C23}, {0x1C4D, 0x1C4F},
+ {0x1C5A, 0x1C7D}, {0x1C80, 0x1C88}, {0x1C90, 0x1CBA},
+ {0x1CBD, 0x1CBF}, {0x1CE9, 0x1CEC}, {0x1CEE, 0x1CF3},
+ {0x1CF5, 0x1CF6}, {0x1CFA, 0x1CFA}, {0x1D00, 0x1DBF},
+ {0x1E00, 0x1F15}, {0x1F18, 0x1F1D}, {0x1F20, 0x1F45},
+ {0x1F48, 0x1F4D}, {0x1F50, 0x1F57}, {0x1F59, 0x1F59},
+ {0x1F5B, 0x1F5B}, {0x1F5D, 0x1F5D}, {0x1F5F, 0x1F7D},
+ {0x1F80, 0x1FB4}, {0x1FB6, 0x1FBC}, {0x1FBE, 0x1FBE},
+ {0x1FC2, 0x1FC4}, {0x1FC6, 0x1FCC}, {0x1FD0, 0x1FD3},
+ {0x1FD6, 0x1FDB}, {0x1FE0, 0x1FEC}, {0x1FF2, 0x1FF4},
+ {0x1FF6, 0x1FFC}, {0x2071, 0x2071}, {0x207F, 0x207F},
+ {0x2090, 0x209C}, {0x2102, 0x2102}, {0x2107, 0x2107},
+ {0x210A, 0x2113}, {0x2115, 0x2115}, {0x2118, 0x211D},
+ {0x2124, 0x2124}, {0x2126, 0x2126}, {0x2128, 0x2128},
+ {0x212A, 0x2139}, {0x213C, 0x213F}, {0x2145, 0x2149},
+ {0x214E, 0x214E}, {0x2160, 0x2188}, {0x2C00, 0x2C2E},
+ {0x2C30, 0x2C5E}, {0x2C60, 0x2CE4}, {0x2CEB, 0x2CEE},
+ {0x2CF2, 0x2CF3}, {0x2D00, 0x2D25}, {0x2D27, 0x2D27},
+ {0x2D2D, 0x2D2D}, {0x2D30, 0x2D67}, {0x2D6F, 0x2D6F},
+ {0x2D80, 0x2D96}, {0x2DA0, 0x2DA6}, {0x2DA8, 0x2DAE},
+ {0x2DB0, 0x2DB6}, {0x2DB8, 0x2DBE}, {0x2DC0, 0x2DC6},
+ {0x2DC8, 0x2DCE}, {0x2DD0, 0x2DD6}, {0x2DD8, 0x2DDE},
+ {0x3005, 0x3007}, {0x3021, 0x3029}, {0x3031, 0x3035},
+ {0x3038, 0x303C}, {0x3041, 0x3096}, {0x309D, 0x309F},
+ {0x30A1, 0x30FA}, {0x30FC, 0x30FF}, {0x3105, 0x312F},
+ {0x3131, 0x318E}, {0x31A0, 0x31BF}, {0x31F0, 0x31FF},
+ {0x3400, 0x4DBF}, {0x4E00, 0x9FFC}, {0xA000, 0xA48C},
+ {0xA4D0, 0xA4FD}, {0xA500, 0xA60C}, {0xA610, 0xA61F},
+ {0xA62A, 0xA62B}, {0xA640, 0xA66E}, {0xA67F, 0xA69D},
+ {0xA6A0, 0xA6EF}, {0xA717, 0xA71F}, {0xA722, 0xA788},
+ {0xA78B, 0xA7BF}, {0xA7C2, 0xA7CA}, {0xA7F5, 0xA801},
+ {0xA803, 0xA805}, {0xA807, 0xA80A}, {0xA80C, 0xA822},
+ {0xA840, 0xA873}, {0xA882, 0xA8B3}, {0xA8F2, 0xA8F7},
+ {0xA8FB, 0xA8FB}, {0xA8FD, 0xA8FE}, {0xA90A, 0xA925},
+ {0xA930, 0xA946}, {0xA960, 0xA97C}, {0xA984, 0xA9B2},
+ {0xA9CF, 0xA9CF}, {0xA9E0, 0xA9E4}, {0xA9E6, 0xA9EF},
+ {0xA9FA, 0xA9FE}, {0xAA00, 0xAA28}, {0xAA40, 0xAA42},
+ {0xAA44, 0xAA4B}, {0xAA60, 0xAA76}, {0xAA7A, 0xAA7A},
+ {0xAA7E, 0xAAAF}, {0xAAB1, 0xAAB1}, {0xAAB5, 0xAAB6},
+ {0xAAB9, 0xAABD}, {0xAAC0, 0xAAC0}, {0xAAC2, 0xAAC2},
+ {0xAADB, 0xAADD}, {0xAAE0, 0xAAEA}, {0xAAF2, 0xAAF4},
+ {0xAB01, 0xAB06}, {0xAB09, 0xAB0E}, {0xAB11, 0xAB16},
+ {0xAB20, 0xAB26}, {0xAB28, 0xAB2E}, {0xAB30, 0xAB5A},
+ {0xAB5C, 0xAB69}, {0xAB70, 0xABE2}, {0xAC00, 0xD7A3},
+ {0xD7B0, 0xD7C6}, {0xD7CB, 0xD7FB}, {0xF900, 0xFA6D},
+ {0xFA70, 0xFAD9}, {0xFB00, 0xFB06}, {0xFB13, 0xFB17},
+ {0xFB1D, 0xFB1D}, {0xFB1F, 0xFB28}, {0xFB2A, 0xFB36},
+ {0xFB38, 0xFB3C}, {0xFB3E, 0xFB3E}, {0xFB40, 0xFB41},
+ {0xFB43, 0xFB44}, {0xFB46, 0xFBB1}, {0xFBD3, 0xFC5D},
+ {0xFC64, 0xFD3D}, {0xFD50, 0xFD8F}, {0xFD92, 0xFDC7},
+ {0xFDF0, 0xFDF9}, {0xFE71, 0xFE71}, {0xFE73, 0xFE73},
+ {0xFE77, 0xFE77}, {0xFE79, 0xFE79}, {0xFE7B, 0xFE7B},
+ {0xFE7D, 0xFE7D}, {0xFE7F, 0xFEFC}, {0xFF21, 0xFF3A},
+ {0xFF41, 0xFF5A}, {0xFF66, 0xFF9D}, {0xFFA0, 0xFFBE},
+ {0xFFC2, 0xFFC7}, {0xFFCA, 0xFFCF}, {0xFFD2, 0xFFD7},
+ {0xFFDA, 0xFFDC}, {0x10000, 0x1000B}, {0x1000D, 0x10026},
+ {0x10028, 0x1003A}, {0x1003C, 0x1003D}, {0x1003F, 0x1004D},
+ {0x10050, 0x1005D}, {0x10080, 0x100FA}, {0x10140, 0x10174},
+ {0x10280, 0x1029C}, {0x102A0, 0x102D0}, {0x10300, 0x1031F},
+ {0x1032D, 0x1034A}, {0x10350, 0x10375}, {0x10380, 0x1039D},
+ {0x103A0, 0x103C3}, {0x103C8, 0x103CF}, {0x103D1, 0x103D5},
+ {0x10400, 0x1049D}, {0x104B0, 0x104D3}, {0x104D8, 0x104FB},
+ {0x10500, 0x10527}, {0x10530, 0x10563}, {0x10600, 0x10736},
+ {0x10740, 0x10755}, {0x10760, 0x10767}, {0x10800, 0x10805},
+ {0x10808, 0x10808}, {0x1080A, 0x10835}, {0x10837, 0x10838},
+ {0x1083C, 0x1083C}, {0x1083F, 0x10855}, {0x10860, 0x10876},
+ {0x10880, 0x1089E}, {0x108E0, 0x108F2}, {0x108F4, 0x108F5},
+ {0x10900, 0x10915}, {0x10920, 0x10939}, {0x10980, 0x109B7},
+ {0x109BE, 0x109BF}, {0x10A00, 0x10A00}, {0x10A10, 0x10A13},
+ {0x10A15, 0x10A17}, {0x10A19, 0x10A35}, {0x10A60, 0x10A7C},
+ {0x10A80, 0x10A9C}, {0x10AC0, 0x10AC7}, {0x10AC9, 0x10AE4},
+ {0x10B00, 0x10B35}, {0x10B40, 0x10B55}, {0x10B60, 0x10B72},
+ {0x10B80, 0x10B91}, {0x10C00, 0x10C48}, {0x10C80, 0x10CB2},
+ {0x10CC0, 0x10CF2}, {0x10D00, 0x10D23}, {0x10E80, 0x10EA9},
+ {0x10EB0, 0x10EB1}, {0x10F00, 0x10F1C}, {0x10F27, 0x10F27},
+ {0x10F30, 0x10F45}, {0x10FB0, 0x10FC4}, {0x10FE0, 0x10FF6},
+ {0x11003, 0x11037}, {0x11083, 0x110AF}, {0x110D0, 0x110E8},
+ {0x11103, 0x11126}, {0x11144, 0x11144}, {0x11147, 0x11147},
+ {0x11150, 0x11172}, {0x11176, 0x11176}, {0x11183, 0x111B2},
+ {0x111C1, 0x111C4}, {0x111DA, 0x111DA}, {0x111DC, 0x111DC},
+ {0x11200, 0x11211}, {0x11213, 0x1122B}, {0x11280, 0x11286},
+ {0x11288, 0x11288}, {0x1128A, 0x1128D}, {0x1128F, 0x1129D},
+ {0x1129F, 0x112A8}, {0x112B0, 0x112DE}, {0x11305, 0x1130C},
+ {0x1130F, 0x11310}, {0x11313, 0x11328}, {0x1132A, 0x11330},
+ {0x11332, 0x11333}, {0x11335, 0x11339}, {0x1133D, 0x1133D},
+ {0x11350, 0x11350}, {0x1135D, 0x11361}, {0x11400, 0x11434},
+ {0x11447, 0x1144A}, {0x1145F, 0x11461}, {0x11480, 0x114AF},
+ {0x114C4, 0x114C5}, {0x114C7, 0x114C7}, {0x11580, 0x115AE},
+ {0x115D8, 0x115DB}, {0x11600, 0x1162F}, {0x11644, 0x11644},
+ {0x11680, 0x116AA}, {0x116B8, 0x116B8}, {0x11700, 0x1171A},
+ {0x11800, 0x1182B}, {0x118A0, 0x118DF}, {0x118FF, 0x11906},
+ {0x11909, 0x11909}, {0x1190C, 0x11913}, {0x11915, 0x11916},
+ {0x11918, 0x1192F}, {0x1193F, 0x1193F}, {0x11941, 0x11941},
+ {0x119A0, 0x119A7}, {0x119AA, 0x119D0}, {0x119E1, 0x119E1},
+ {0x119E3, 0x119E3}, {0x11A00, 0x11A00}, {0x11A0B, 0x11A32},
+ {0x11A3A, 0x11A3A}, {0x11A50, 0x11A50}, {0x11A5C, 0x11A89},
+ {0x11A9D, 0x11A9D}, {0x11AC0, 0x11AF8}, {0x11C00, 0x11C08},
+ {0x11C0A, 0x11C2E}, {0x11C40, 0x11C40}, {0x11C72, 0x11C8F},
+ {0x11D00, 0x11D06}, {0x11D08, 0x11D09}, {0x11D0B, 0x11D30},
+ {0x11D46, 0x11D46}, {0x11D60, 0x11D65}, {0x11D67, 0x11D68},
+ {0x11D6A, 0x11D89}, {0x11D98, 0x11D98}, {0x11EE0, 0x11EF2},
+ {0x11FB0, 0x11FB0}, {0x12000, 0x12399}, {0x12400, 0x1246E},
+ {0x12480, 0x12543}, {0x13000, 0x1342E}, {0x14400, 0x14646},
+ {0x16800, 0x16A38}, {0x16A40, 0x16A5E}, {0x16AD0, 0x16AED},
+ {0x16B00, 0x16B2F}, {0x16B40, 0x16B43}, {0x16B63, 0x16B77},
+ {0x16B7D, 0x16B8F}, {0x16E40, 0x16E7F}, {0x16F00, 0x16F4A},
+ {0x16F50, 0x16F50}, {0x16F93, 0x16F9F}, {0x16FE0, 0x16FE1},
+ {0x16FE3, 0x16FE3}, {0x17000, 0x187F7}, {0x18800, 0x18CD5},
+ {0x18D00, 0x18D08}, {0x1B000, 0x1B11E}, {0x1B150, 0x1B152},
+ {0x1B164, 0x1B167}, {0x1B170, 0x1B2FB}, {0x1BC00, 0x1BC6A},
+ {0x1BC70, 0x1BC7C}, {0x1BC80, 0x1BC88}, {0x1BC90, 0x1BC99},
+ {0x1D400, 0x1D454}, {0x1D456, 0x1D49C}, {0x1D49E, 0x1D49F},
+ {0x1D4A2, 0x1D4A2}, {0x1D4A5, 0x1D4A6}, {0x1D4A9, 0x1D4AC},
+ {0x1D4AE, 0x1D4B9}, {0x1D4BB, 0x1D4BB}, {0x1D4BD, 0x1D4C3},
+ {0x1D4C5, 0x1D505}, {0x1D507, 0x1D50A}, {0x1D50D, 0x1D514},
+ {0x1D516, 0x1D51C}, {0x1D51E, 0x1D539}, {0x1D53B, 0x1D53E},
+ {0x1D540, 0x1D544}, {0x1D546, 0x1D546}, {0x1D54A, 0x1D550},
+ {0x1D552, 0x1D6A5}, {0x1D6A8, 0x1D6C0}, {0x1D6C2, 0x1D6DA},
+ {0x1D6DC, 0x1D6FA}, {0x1D6FC, 0x1D714}, {0x1D716, 0x1D734},
+ {0x1D736, 0x1D74E}, {0x1D750, 0x1D76E}, {0x1D770, 0x1D788},
+ {0x1D78A, 0x1D7A8}, {0x1D7AA, 0x1D7C2}, {0x1D7C4, 0x1D7CB},
+ {0x1E100, 0x1E12C}, {0x1E137, 0x1E13D}, {0x1E14E, 0x1E14E},
+ {0x1E2C0, 0x1E2EB}, {0x1E800, 0x1E8C4}, {0x1E900, 0x1E943},
+ {0x1E94B, 0x1E94B}, {0x1EE00, 0x1EE03}, {0x1EE05, 0x1EE1F},
+ {0x1EE21, 0x1EE22}, {0x1EE24, 0x1EE24}, {0x1EE27, 0x1EE27},
+ {0x1EE29, 0x1EE32}, {0x1EE34, 0x1EE37}, {0x1EE39, 0x1EE39},
+ {0x1EE3B, 0x1EE3B}, {0x1EE42, 0x1EE42}, {0x1EE47, 0x1EE47},
+ {0x1EE49, 0x1EE49}, {0x1EE4B, 0x1EE4B}, {0x1EE4D, 0x1EE4F},
+ {0x1EE51, 0x1EE52}, {0x1EE54, 0x1EE54}, {0x1EE57, 0x1EE57},
+ {0x1EE59, 0x1EE59}, {0x1EE5B, 0x1EE5B}, {0x1EE5D, 0x1EE5D},
+ {0x1EE5F, 0x1EE5F}, {0x1EE61, 0x1EE62}, {0x1EE64, 0x1EE64},
+ {0x1EE67, 0x1EE6A}, {0x1EE6C, 0x1EE72}, {0x1EE74, 0x1EE77},
+ {0x1EE79, 0x1EE7C}, {0x1EE7E, 0x1EE7E}, {0x1EE80, 0x1EE89},
+ {0x1EE8B, 0x1EE9B}, {0x1EEA1, 0x1EEA3}, {0x1EEA5, 0x1EEA9},
+ {0x1EEAB, 0x1EEBB}, {0x20000, 0x2A6DD}, {0x2A700, 0x2B734},
+ {0x2B740, 0x2B81D}, {0x2B820, 0x2CEA1}, {0x2CEB0, 0x2EBE0},
+ {0x2F800, 0x2FA1D}, {0x30000, 0x3134A}};
+
+// Unicode 13 XID_Continue, excluding XID_Start
+// The Unicode Property XID_Continue is a super set of XID_Start.
+// To save Space, the table below only contains the codepoints
+// that are not also in XID_Start.
+static const llvm::sys::UnicodeCharRange XIDContinueRanges[] = {
+ {0x0030, 0x0039}, {0x005F, 0x005F}, {0x00B7, 0x00B7},
+ {0x0300, 0x036F}, {0x0387, 0x0387}, {0x0483, 0x0487},
+ {0x0591, 0x05BD}, {0x05BF, 0x05BF}, {0x05C1, 0x05C2},
+ {0x05C4, 0x05C5}, {0x05C7, 0x05C7}, {0x0610, 0x061A},
+ {0x064B, 0x0669}, {0x0670, 0x0670}, {0x06D6, 0x06DC},
+ {0x06DF, 0x06E4}, {0x06E7, 0x06E8}, {0x06EA, 0x06ED},
+ {0x06F0, 0x06F9}, {0x0711, 0x0711}, {0x0730, 0x074A},
+ {0x07A6, 0x07B0}, {0x07C0, 0x07C9}, {0x07EB, 0x07F3},
+ {0x07FD, 0x07FD}, {0x0816, 0x0819}, {0x081B, 0x0823},
+ {0x0825, 0x0827}, {0x0829, 0x082D}, {0x0859, 0x085B},
+ {0x08D3, 0x08E1}, {0x08E3, 0x0903}, {0x093A, 0x093C},
+ {0x093E, 0x094F}, {0x0951, 0x0957}, {0x0962, 0x0963},
+ {0x0966, 0x096F}, {0x0981, 0x0983}, {0x09BC, 0x09BC},
+ {0x09BE, 0x09C4}, {0x09C7, 0x09C8}, {0x09CB, 0x09CD},
+ {0x09D7, 0x09D7}, {0x09E2, 0x09E3}, {0x09E6, 0x09EF},
+ {0x09FE, 0x09FE}, {0x0A01, 0x0A03}, {0x0A3C, 0x0A3C},
+ {0x0A3E, 0x0A42}, {0x0A47, 0x0A48}, {0x0A4B, 0x0A4D},
+ {0x0A51, 0x0A51}, {0x0A66, 0x0A71}, {0x0A75, 0x0A75},
+ {0x0A81, 0x0A83}, {0x0ABC, 0x0ABC}, {0x0ABE, 0x0AC5},
+ {0x0AC7, 0x0AC9}, {0x0ACB, 0x0ACD}, {0x0AE2, 0x0AE3},
+ {0x0AE6, 0x0AEF}, {0x0AFA, 0x0AFF}, {0x0B01, 0x0B03},
+ {0x0B3C, 0x0B3C}, {0x0B3E, 0x0B44}, {0x0B47, 0x0B48},
+ {0x0B4B, 0x0B4D}, {0x0B55, 0x0B57}, {0x0B62, 0x0B63},
+ {0x0B66, 0x0B6F}, {0x0B82, 0x0B82}, {0x0BBE, 0x0BC2},
+ {0x0BC6, 0x0BC8}, {0x0BCA, 0x0BCD}, {0x0BD7, 0x0BD7},
+ {0x0BE6, 0x0BEF}, {0x0C00, 0x0C04}, {0x0C3E, 0x0C44},
+ {0x0C46, 0x0C48}, {0x0C4A, 0x0C4D}, {0x0C55, 0x0C56},
+ {0x0C62, 0x0C63}, {0x0C66, 0x0C6F}, {0x0C81, 0x0C83},
+ {0x0CBC, 0x0CBC}, {0x0CBE, 0x0CC4}, {0x0CC6, 0x0CC8},
+ {0x0CCA, 0x0CCD}, {0x0CD5, 0x0CD6}, {0x0CE2, 0x0CE3},
+ {0x0CE6, 0x0CEF}, {0x0D00, 0x0D03}, {0x0D3B, 0x0D3C},
+ {0x0D3E, 0x0D44}, {0x0D46, 0x0D48}, {0x0D4A, 0x0D4D},
+ {0x0D57, 0x0D57}, {0x0D62, 0x0D63}, {0x0D66, 0x0D6F},
+ {0x0D81, 0x0D83}, {0x0DCA, 0x0DCA}, {0x0DCF, 0x0DD4},
+ {0x0DD6, 0x0DD6}, {0x0DD8, 0x0DDF}, {0x0DE6, 0x0DEF},
+ {0x0DF2, 0x0DF3}, {0x0E31, 0x0E31}, {0x0E33, 0x0E3A},
+ {0x0E47, 0x0E4E}, {0x0E50, 0x0E59}, {0x0EB1, 0x0EB1},
+ {0x0EB3, 0x0EBC}, {0x0EC8, 0x0ECD}, {0x0ED0, 0x0ED9},
+ {0x0F18, 0x0F19}, {0x0F20, 0x0F29}, {0x0F35, 0x0F35},
+ {0x0F37, 0x0F37}, {0x0F39, 0x0F39}, {0x0F3E, 0x0F3F},
+ {0x0F71, 0x0F84}, {0x0F86, 0x0F87}, {0x0F8D, 0x0F97},
+ {0x0F99, 0x0FBC}, {0x0FC6, 0x0FC6}, {0x102B, 0x103E},
+ {0x1040, 0x1049}, {0x1056, 0x1059}, {0x105E, 0x1060},
+ {0x1062, 0x1064}, {0x1067, 0x106D}, {0x1071, 0x1074},
+ {0x1082, 0x108D}, {0x108F, 0x109D}, {0x135D, 0x135F},
+ {0x1369, 0x1371}, {0x1712, 0x1714}, {0x1732, 0x1734},
+ {0x1752, 0x1753}, {0x1772, 0x1773}, {0x17B4, 0x17D3},
+ {0x17DD, 0x17DD}, {0x17E0, 0x17E9}, {0x180B, 0x180D},
+ {0x1810, 0x1819}, {0x18A9, 0x18A9}, {0x1920, 0x192B},
+ {0x1930, 0x193B}, {0x1946, 0x194F}, {0x19D0, 0x19DA},
+ {0x1A17, 0x1A1B}, {0x1A55, 0x1A5E}, {0x1A60, 0x1A7C},
+ {0x1A7F, 0x1A89}, {0x1A90, 0x1A99}, {0x1AB0, 0x1ABD},
+ {0x1ABF, 0x1AC0}, {0x1B00, 0x1B04}, {0x1B34, 0x1B44},
+ {0x1B50, 0x1B59}, {0x1B6B, 0x1B73}, {0x1B80, 0x1B82},
+ {0x1BA1, 0x1BAD}, {0x1BB0, 0x1BB9}, {0x1BE6, 0x1BF3},
+ {0x1C24, 0x1C37}, {0x1C40, 0x1C49}, {0x1C50, 0x1C59},
+ {0x1CD0, 0x1CD2}, {0x1CD4, 0x1CE8}, {0x1CED, 0x1CED},
+ {0x1CF4, 0x1CF4}, {0x1CF7, 0x1CF9}, {0x1DC0, 0x1DF9},
+ {0x1DFB, 0x1DFF}, {0x203F, 0x2040}, {0x2054, 0x2054},
+ {0x20D0, 0x20DC}, {0x20E1, 0x20E1}, {0x20E5, 0x20F0},
+ {0x2CEF, 0x2CF1}, {0x2D7F, 0x2D7F}, {0x2DE0, 0x2DFF},
+ {0x302A, 0x302F}, {0x3099, 0x309A}, {0xA620, 0xA629},
+ {0xA66F, 0xA66F}, {0xA674, 0xA67D}, {0xA69E, 0xA69F},
+ {0xA6F0, 0xA6F1}, {0xA802, 0xA802}, {0xA806, 0xA806},
+ {0xA80B, 0xA80B}, {0xA823, 0xA827}, {0xA82C, 0xA82C},
+ {0xA880, 0xA881}, {0xA8B4, 0xA8C5}, {0xA8D0, 0xA8D9},
+ {0xA8E0, 0xA8F1}, {0xA8FF, 0xA909}, {0xA926, 0xA92D},
+ {0xA947, 0xA953}, {0xA980, 0xA983}, {0xA9B3, 0xA9C0},
+ {0xA9D0, 0xA9D9}, {0xA9E5, 0xA9E5}, {0xA9F0, 0xA9F9},
+ {0xAA29, 0xAA36}, {0xAA43, 0xAA43}, {0xAA4C, 0xAA4D},
+ {0xAA50, 0xAA59}, {0xAA7B, 0xAA7D}, {0xAAB0, 0xAAB0},
+ {0xAAB2, 0xAAB4}, {0xAAB7, 0xAAB8}, {0xAABE, 0xAABF},
+ {0xAAC1, 0xAAC1}, {0xAAEB, 0xAAEF}, {0xAAF5, 0xAAF6},
+ {0xABE3, 0xABEA}, {0xABEC, 0xABED}, {0xABF0, 0xABF9},
+ {0xFB1E, 0xFB1E}, {0xFE00, 0xFE0F}, {0xFE20, 0xFE2F},
+ {0xFE33, 0xFE34}, {0xFE4D, 0xFE4F}, {0xFF10, 0xFF19},
+ {0xFF3F, 0xFF3F}, {0xFF9E, 0xFF9F}, {0x101FD, 0x101FD},
+ {0x102E0, 0x102E0}, {0x10376, 0x1037A}, {0x104A0, 0x104A9},
+ {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
+ {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x10AE5, 0x10AE6},
+ {0x10D24, 0x10D27}, {0x10D30, 0x10D39}, {0x10EAB, 0x10EAC},
+ {0x10F46, 0x10F50}, {0x11000, 0x11002}, {0x11038, 0x11046},
+ {0x11066, 0x1106F}, {0x1107F, 0x11082}, {0x110B0, 0x110BA},
+ {0x110F0, 0x110F9}, {0x11100, 0x11102}, {0x11127, 0x11134},
+ {0x11136, 0x1113F}, {0x11145, 0x11146}, {0x11173, 0x11173},
+ {0x11180, 0x11182}, {0x111B3, 0x111C0}, {0x111C9, 0x111CC},
+ {0x111CE, 0x111D9}, {0x1122C, 0x11237}, {0x1123E, 0x1123E},
+ {0x112DF, 0x112EA}, {0x112F0, 0x112F9}, {0x11300, 0x11303},
+ {0x1133B, 0x1133C}, {0x1133E, 0x11344}, {0x11347, 0x11348},
+ {0x1134B, 0x1134D}, {0x11357, 0x11357}, {0x11362, 0x11363},
+ {0x11366, 0x1136C}, {0x11370, 0x11374}, {0x11435, 0x11446},
+ {0x11450, 0x11459}, {0x1145E, 0x1145E}, {0x114B0, 0x114C3},
+ {0x114D0, 0x114D9}, {0x115AF, 0x115B5}, {0x115B8, 0x115C0},
+ {0x115DC, 0x115DD}, {0x11630, 0x11640}, {0x11650, 0x11659},
+ {0x116AB, 0x116B7}, {0x116C0, 0x116C9}, {0x1171D, 0x1172B},
+ {0x11730, 0x11739}, {0x1182C, 0x1183A}, {0x118E0, 0x118E9},
+ {0x11930, 0x11935}, {0x11937, 0x11938}, {0x1193B, 0x1193E},
+ {0x11940, 0x11940}, {0x11942, 0x11943}, {0x11950, 0x11959},
+ {0x119D1, 0x119D7}, {0x119DA, 0x119E0}, {0x119E4, 0x119E4},
+ {0x11A01, 0x11A0A}, {0x11A33, 0x11A39}, {0x11A3B, 0x11A3E},
+ {0x11A47, 0x11A47}, {0x11A51, 0x11A5B}, {0x11A8A, 0x11A99},
+ {0x11C2F, 0x11C36}, {0x11C38, 0x11C3F}, {0x11C50, 0x11C59},
+ {0x11C92, 0x11CA7}, {0x11CA9, 0x11CB6}, {0x11D31, 0x11D36},
+ {0x11D3A, 0x11D3A}, {0x11D3C, 0x11D3D}, {0x11D3F, 0x11D45},
+ {0x11D47, 0x11D47}, {0x11D50, 0x11D59}, {0x11D8A, 0x11D8E},
+ {0x11D90, 0x11D91}, {0x11D93, 0x11D97}, {0x11DA0, 0x11DA9},
+ {0x11EF3, 0x11EF6}, {0x16A60, 0x16A69}, {0x16AF0, 0x16AF4},
+ {0x16B30, 0x16B36}, {0x16B50, 0x16B59}, {0x16F4F, 0x16F4F},
+ {0x16F51, 0x16F87}, {0x16F8F, 0x16F92}, {0x16FE4, 0x16FE4},
+ {0x16FF0, 0x16FF1}, {0x1BC9D, 0x1BC9E}, {0x1D165, 0x1D169},
+ {0x1D16D, 0x1D172}, {0x1D17B, 0x1D182}, {0x1D185, 0x1D18B},
+ {0x1D1AA, 0x1D1AD}, {0x1D242, 0x1D244}, {0x1D7CE, 0x1D7FF},
+ {0x1DA00, 0x1DA36}, {0x1DA3B, 0x1DA6C}, {0x1DA75, 0x1DA75},
+ {0x1DA84, 0x1DA84}, {0x1DA9B, 0x1DA9F}, {0x1DAA1, 0x1DAAF},
+ {0x1E000, 0x1E006}, {0x1E008, 0x1E018}, {0x1E01B, 0x1E021},
+ {0x1E023, 0x1E024}, {0x1E026, 0x1E02A}, {0x1E130, 0x1E136},
+ {0x1E140, 0x1E149}, {0x1E2EC, 0x1E2F9}, {0x1E8D0, 0x1E8D6},
+ {0x1E944, 0x1E94A}, {0x1E950, 0x1E959}, {0x1FBF0, 0x1FBF9},
+ {0xE0100, 0xE01EF}};
+
// C11 D.1, C++11 [charname.allowed]
static const llvm::sys::UnicodeCharRange C11AllowedIDCharRanges[] = {
// 1
@@ -40,127 +378,6 @@ static const llvm::sys::UnicodeCharRange C11AllowedIDCharRanges[] = {
{ 0xD0000, 0xDFFFD }, { 0xE0000, 0xEFFFD }
};
-// C++03 [extendid]
-// Note that this is not the same as C++98, but we don't distinguish C++98
-// and C++03 in Clang.
-static const llvm::sys::UnicodeCharRange CXX03AllowedIDCharRanges[] = {
- // Latin
- { 0x00C0, 0x00D6 }, { 0x00D8, 0x00F6 }, { 0x00F8, 0x01F5 },
- { 0x01FA, 0x0217 }, { 0x0250, 0x02A8 },
-
- // Greek
- { 0x0384, 0x0384 }, { 0x0388, 0x038A }, { 0x038C, 0x038C },
- { 0x038E, 0x03A1 }, { 0x03A3, 0x03CE }, { 0x03D0, 0x03D6 },
- { 0x03DA, 0x03DA }, { 0x03DC, 0x03DC }, { 0x03DE, 0x03DE },
- { 0x03E0, 0x03E0 }, { 0x03E2, 0x03F3 },
-
- // Cyrillic
- { 0x0401, 0x040D }, { 0x040F, 0x044F }, { 0x0451, 0x045C },
- { 0x045E, 0x0481 }, { 0x0490, 0x04C4 }, { 0x04C7, 0x04C8 },
- { 0x04CB, 0x04CC }, { 0x04D0, 0x04EB }, { 0x04EE, 0x04F5 },
- { 0x04F8, 0x04F9 },
-
- // Armenian
- { 0x0531, 0x0556 }, { 0x0561, 0x0587 },
-
- // Hebrew
- { 0x05D0, 0x05EA }, { 0x05F0, 0x05F4 },
-
- // Arabic
- { 0x0621, 0x063A }, { 0x0640, 0x0652 }, { 0x0670, 0x06B7 },
- { 0x06BA, 0x06BE }, { 0x06C0, 0x06CE }, { 0x06E5, 0x06E7 },
-
- // Devanagari
- { 0x0905, 0x0939 }, { 0x0958, 0x0962 },
-
- // Bengali
- { 0x0985, 0x098C }, { 0x098F, 0x0990 }, { 0x0993, 0x09A8 },
- { 0x09AA, 0x09B0 }, { 0x09B2, 0x09B2 }, { 0x09B6, 0x09B9 },
- { 0x09DC, 0x09DD }, { 0x09DF, 0x09E1 }, { 0x09F0, 0x09F1 },
-
- // Gurmukhi
- { 0x0A05, 0x0A0A }, { 0x0A0F, 0x0A10 }, { 0x0A13, 0x0A28 },
- { 0x0A2A, 0x0A30 }, { 0x0A32, 0x0A33 }, { 0x0A35, 0x0A36 },
- { 0x0A38, 0x0A39 }, { 0x0A59, 0x0A5C }, { 0x0A5E, 0x0A5E },
-
- // Gujarti
- { 0x0A85, 0x0A8B }, { 0x0A8D, 0x0A8D }, { 0x0A8F, 0x0A91 },
- { 0x0A93, 0x0AA8 }, { 0x0AAA, 0x0AB0 }, { 0x0AB2, 0x0AB3 },
- { 0x0AB5, 0x0AB9 }, { 0x0AE0, 0x0AE0 },
-
- // Oriya
- { 0x0B05, 0x0B0C }, { 0x0B0F, 0x0B10 }, { 0x0B13, 0x0B28 },
- { 0x0B2A, 0x0B30 }, { 0x0B32, 0x0B33 }, { 0x0B36, 0x0B39 },
- { 0x0B5C, 0x0B5D }, { 0x0B5F, 0x0B61 },
-
- // Tamil
- { 0x0B85, 0x0B8A }, { 0x0B8E, 0x0B90 }, { 0x0B92, 0x0B95 },
- { 0x0B99, 0x0B9A }, { 0x0B9C, 0x0B9C }, { 0x0B9E, 0x0B9F },
- { 0x0BA3, 0x0BA4 }, { 0x0BA8, 0x0BAA }, { 0x0BAE, 0x0BB5 },
- { 0x0BB7, 0x0BB9 },
-
- // Telugu
- { 0x0C05, 0x0C0C }, { 0x0C0E, 0x0C10 }, { 0x0C12, 0x0C28 },
- { 0x0C2A, 0x0C33 }, { 0x0C35, 0x0C39 }, { 0x0C60, 0x0C61 },
-
- // Kannada
- { 0x0C85, 0x0C8C }, { 0x0C8E, 0x0C90 }, { 0x0C92, 0x0CA8 },
- { 0x0CAA, 0x0CB3 }, { 0x0CB5, 0x0CB9 }, { 0x0CE0, 0x0CE1 },
-
- // Malayam
- { 0x0D05, 0x0D0C }, { 0x0D0E, 0x0D10 }, { 0x0D12, 0x0D28 },
- { 0x0D2A, 0x0D39 }, { 0x0D60, 0x0D61 },
-
- // Thai
- { 0x0E01, 0x0E30 }, { 0x0E32, 0x0E33 }, { 0x0E40, 0x0E46 },
- { 0x0E4F, 0x0E5B },
-
- // Lao
- { 0x0E81, 0x0E82 }, { 0x0E84, 0x0E84 }, { 0x0E87, 0x0E87 },
- { 0x0E88, 0x0E88 }, { 0x0E8A, 0x0E8A }, { 0x0E8D, 0x0E8D },
- { 0x0E94, 0x0E97 }, { 0x0E99, 0x0E9F }, { 0x0EA1, 0x0EA3 },
- { 0x0EA5, 0x0EA5 }, { 0x0EA7, 0x0EA7 }, { 0x0EAA, 0x0EAA },
- { 0x0EAB, 0x0EAB }, { 0x0EAD, 0x0EB0 }, { 0x0EB2, 0x0EB2 },
- { 0x0EB3, 0x0EB3 }, { 0x0EBD, 0x0EBD }, { 0x0EC0, 0x0EC4 },
- { 0x0EC6, 0x0EC6 },
-
- // Georgian
- { 0x10A0, 0x10C5 }, { 0x10D0, 0x10F6 },
-
- // Hangul
- { 0x1100, 0x1159 }, { 0x1161, 0x11A2 }, { 0x11A8, 0x11F9 },
-
- // Latin (2)
- { 0x1E00, 0x1E9A }, { 0x1EA0, 0x1EF9 },
-
- // Greek (2)
- { 0x1F00, 0x1F15 }, { 0x1F18, 0x1F1D }, { 0x1F20, 0x1F45 },
- { 0x1F48, 0x1F4D }, { 0x1F50, 0x1F57 }, { 0x1F59, 0x1F59 },
- { 0x1F5B, 0x1F5B }, { 0x1F5D, 0x1F5D }, { 0x1F5F, 0x1F7D },
- { 0x1F80, 0x1FB4 }, { 0x1FB6, 0x1FBC }, { 0x1FC2, 0x1FC4 },
- { 0x1FC6, 0x1FCC }, { 0x1FD0, 0x1FD3 }, { 0x1FD6, 0x1FDB },
- { 0x1FE0, 0x1FEC }, { 0x1FF2, 0x1FF4 }, { 0x1FF6, 0x1FFC },
-
- // Hiragana
- { 0x3041, 0x3094 }, { 0x309B, 0x309E },
-
- // Katakana
- { 0x30A1, 0x30FE },
-
- // Bopmofo [sic]
- { 0x3105, 0x312C },
-
- // CJK Unified Ideographs
- { 0x4E00, 0x9FA5 }, { 0xF900, 0xFA2D }, { 0xFB1F, 0xFB36 },
- { 0xFB38, 0xFB3C }, { 0xFB3E, 0xFB3E }, { 0xFB40, 0xFB41 },
- { 0xFB42, 0xFB44 }, { 0xFB46, 0xFBB1 }, { 0xFBD3, 0xFD3F },
- { 0xFD50, 0xFD8F }, { 0xFD92, 0xFDC7 }, { 0xFDF0, 0xFDFB },
- { 0xFE70, 0xFE72 }, { 0xFE74, 0xFE74 }, { 0xFE76, 0xFEFC },
- { 0xFF21, 0xFF3A }, { 0xFF41, 0xFF5A }, { 0xFF66, 0xFFBE },
- { 0xFFC2, 0xFFC7 }, { 0xFFCA, 0xFFCF }, { 0xFFD2, 0xFFD7 },
- { 0xFFDA, 0xFFDC }
-};
-
// C99 Annex D
static const llvm::sys::UnicodeCharRange C99AllowedIDCharRanges[] = {
// Latin (1)
diff --git a/clang/test/CXX/drs/dr1xx.cpp b/clang/test/CXX/drs/dr1xx.cpp
index b262db004fcf9..4efa2e2fa9431 100644
--- a/clang/test/CXX/drs/dr1xx.cpp
+++ b/clang/test/CXX/drs/dr1xx.cpp
@@ -370,13 +370,10 @@ namespace dr128 { // dr128: yes
// dr129: dup 616
// dr130: na
-namespace dr131 { // dr131: yes
+namespace dr131 { // dr131: sup P1949
const char *a_with_\u0e8c = "\u0e8c";
const char *b_with_\u0e8d = "\u0e8d";
const char *c_with_\u0e8e = "\u0e8e";
-#if __cplusplus < 201103L
- // expected-error at -4 {{expected ';'}} expected-error at -2 {{expected ';'}}
-#endif
}
namespace dr132 { // dr132: no
diff --git a/clang/test/CXX/drs/dr2xx.cpp b/clang/test/CXX/drs/dr2xx.cpp
index ab70b8742d00b..52aca02382094 100644
--- a/clang/test/CXX/drs/dr2xx.cpp
+++ b/clang/test/CXX/drs/dr2xx.cpp
@@ -597,12 +597,8 @@ namespace dr247 { // dr247: yes
void (F::*i)() = &F::f;
}
-namespace dr248 { // dr248: yes c++11
- // FIXME: Should this also apply to c++98 mode? This was a DR against C++98.
+namespace dr248 { // dr248: sup P1949
int \u040d\u040e = 0;
-#if __cplusplus < 201103L
- // FIXME: expected-error at -2 {{expected ';'}}
-#endif
}
namespace dr249 { // dr249: yes
diff --git a/clang/test/CXX/drs/dr6xx.cpp b/clang/test/CXX/drs/dr6xx.cpp
index e32d6b2afb131..e9e08fd2e2c00 100644
--- a/clang/test/CXX/drs/dr6xx.cpp
+++ b/clang/test/CXX/drs/dr6xx.cpp
@@ -720,11 +720,8 @@ namespace dr662 { // dr662: yes
void g(int n) { f<int&>(n); } // expected-note {{instantiation of}}
}
-namespace dr663 { // dr663: yes c++11
+namespace dr663 { // dr663: sup P1949
int ЍЎ = 123;
-#if __cplusplus < 201103L
- // expected-error at -2 {{non-ASCII}}
-#endif
}
#if __cplusplus >= 201103L
diff --git a/clang/test/FixIt/fixit-unicode.c b/clang/test/FixIt/fixit-unicode.c
index 360ac69574954..70c9751a2bcd6 100644
--- a/clang/test/FixIt/fixit-unicode.c
+++ b/clang/test/FixIt/fixit-unicode.c
@@ -13,15 +13,11 @@ struct Foo {
void test1() {
struct Foo foo;
foo.bar = 42☃
-// CHECK: error: non-ASCII characters are not allowed outside of literals and identifiers
-// CHECK: {{^ \^}}
-// CHECK: error: expected ';' after expression
-// Make sure we emit the fixit right in front of the snowman.
-// CHECK: {{^ \^}}
-// CHECK: {{^ ;}}
+ // CHECK: error: character <U+2603> not allowed in an identifier
+ // CHECK: {{^ \^}}
+ // Make sure we emit the fixit right in front of the snowman.
-// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-8]]:15-[[@LINE-8]]:18}:""
-// CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-9]]:15-[[@LINE-9]]:15}:";"
+ // CHECK-MACHINE: fix-it:"{{.*}}":{[[@LINE-5]]:15-[[@LINE-5]]:18}:""
}
diff --git a/clang/test/Lexer/unicode.c b/clang/test/Lexer/unicode.c
index 01285fbc21380..fb974a42a1c0c 100644
--- a/clang/test/Lexer/unicode.c
+++ b/clang/test/Lexer/unicode.c
@@ -23,9 +23,30 @@ static const char *copyright = STR(COPYRIGHT); // no-warning
#if PP_ONLY
COPYRIGHT
// CHECK: Copyright © {{2012}}
-CHECK: The preprocessor should not complain about Unicode characters like ©.
+CHECK : The preprocessor should not complain about Unicode characters like ©.
#endif
+ int _;
+
+#ifdef __cplusplus
+
+extern int ༀ;
+extern int 𑩐;
+extern int 𐠈;
+extern int ꙮ;
+
+extern int 🌹; // expected-error {{unexpected character <U+1F339>}} \
+ expected-warning {{declaration does not declare anything}}
+
+extern int 👷; // expected-error {{unexpected character <U+1F477>}} \
+ expected-warning {{declaration does not declare anything}}
+
+extern int 👷♀; // expected-warning {{declaration does not declare anything}} \
+ expected-error {{unexpected character <U+1F477>}} \
+ expected-error {{unexpected character <U+200D>}} \
+ expected-error {{unexpected character <U+2640>}}
+#else
+
// A 🌹 by any other name....
extern int 🌹;
int 🌵(int 🌻) { return 🌻+ 1; }
@@ -46,7 +67,9 @@ int xx;
int foobar = 0; // expected-warning {{identifier contains Unicode character <U+200B> that is invisible in some environments}}
int x = foobar; // expected-error {{undeclared identifier}}
-int ∣foo; // expected-error {{non-ASCII character}}
+int ∣foo; // expected-error {{unexpected character <U+2223>}}
#ifndef PP_ONLY
#define ∶ x // expected-error {{macro name must be an identifier}}
#endif
+
+#endif
diff --git a/clang/test/Parser/cxx11-user-defined-literals.cpp b/clang/test/Parser/cxx11-user-defined-literals.cpp
index d3188f8f43ebd..714be62381c07 100644
--- a/clang/test/Parser/cxx11-user-defined-literals.cpp
+++ b/clang/test/Parser/cxx11-user-defined-literals.cpp
@@ -140,6 +140,6 @@ void operator""_℮""_℮(unsigned long long) {} // expected-note {{previous}}
void operator""_\u212e""_\u212e(unsigned long long) {} // expected-error {{redefinition}}
#define ¢ *0.01 // expected-error {{macro name must be an identifier}}
-constexpr int operator""_¢(long double d) { return d * 100; } // expected-error {{non-ASCII}}
-constexpr int operator""_¢(unsigned long long n) { return n; } // expected-error {{non-ASCII}}
-static_assert(0.02_¢ == 2_¢, ""); // expected-error 2{{non-ASCII}}
+constexpr int operator""_¢(long double d) { return d * 100; } // expected-error {{character <U+00A2> not allowed in an identifier}}
+constexpr int operator""_¢(unsigned long long n) { return n; } // expected-error {{character <U+00A2> not allowed in an identifier}}
+static_assert(0.02_¢ == 2_¢, ""); // expected-error 2{{character <U+00A2> not allowed in an identifier}}
diff --git a/clang/test/Preprocessor/assembler-with-cpp.c b/clang/test/Preprocessor/assembler-with-cpp.c
index f03cb06ea1158..8bdac0c495f29 100644
--- a/clang/test/Preprocessor/assembler-with-cpp.c
+++ b/clang/test/Preprocessor/assembler-with-cpp.c
@@ -73,8 +73,8 @@
// CHECK-Identifiers-True: 11: #0
// Universal character names can specify basic ascii and control characters
-12: \u0020\u0030\u0080\u0000
-// CHECK-Identifiers-False: 12: \u0020\u0030\u0080\u0000
+12: \u0020\u0030
+// CHECK-Identifiers-False: 12: \u0020\u0030
// This should not crash
// rdar://8823139
diff --git a/clang/test/Preprocessor/ucn-allowed-chars.c b/clang/test/Preprocessor/ucn-allowed-chars.c
index d7d67fe0d60cc..f8bfb1ee2cdbc 100644
--- a/clang/test/Preprocessor/ucn-allowed-chars.c
+++ b/clang/test/Preprocessor/ucn-allowed-chars.c
@@ -16,7 +16,7 @@ extern char a\uFFFF; // none
// Identifier initial characters
extern char \u0E50; // C++03, C11, C++11
-extern char \u0300; // disallowed initially in C11/C++11, always in C99/C++03
+extern char \u0300; // disallowed in C99/C++03
extern char \u0D61; // C99, C11, C++03, C++11
@@ -38,19 +38,16 @@ extern char \u0D61; // C99, C11, C++03, C++11
#if __cplusplus
+// expected-error at 9 {{character <U+0384> not allowed in an identifier}}
+// expected-error at 11 {{character <U+FFFF> not allowed in an identifier}}
+// expected-error at 18 {{expected unqualified-id}}
# if __cplusplus >= 201103L
// C++11
-// expected-warning at 7 {{using this character in an identifier is incompatible with C++98}}
-// expected-warning at 8 {{using this character in an identifier is incompatible with C++98}}
-// expected-error at 11 {{expected ';'}}
// expected-error at 19 {{expected unqualified-id}}
// expected-error at 33 {{invalid universal character}}
# else
// C++03
-// expected-error at 7 {{expected ';'}}
-// expected-error at 8 {{expected ';'}}
-// expected-error at 11 {{expected ';'}}
// expected-error at 19 {{expected unqualified-id}}
// expected-warning at 33 {{universal character name refers to a surrogate character}}
@@ -60,16 +57,16 @@ extern char \u0D61; // C99, C11, C++03, C++11
// C11
// expected-warning at 7 {{using this character in an identifier is incompatible with C99}}
// expected-warning at 9 {{using this character in an identifier is incompatible with C99}}
-// expected-error at 11 {{expected ';'}}
+// expected-error at 11 {{character <U+FFFF> not allowed in an identifier}}
// expected-warning at 18 {{starting an identifier with this character is incompatible with C99}}
// expected-error at 19 {{expected identifier}}
// expected-error at 33 {{invalid universal character}}
# else
// C99
-// expected-error at 7 {{expected ';'}}
-// expected-error at 9 {{expected ';'}}
-// expected-error at 11 {{expected ';'}}
+// expected-error at 7 {{not allowed in an identifier}}
+// expected-error at 9 {{not allowed in an identifier}}
+// expected-error at 11 {{not allowed in an identifier}}
// expected-error at 18 {{expected identifier}}
// expected-error at 19 {{expected identifier}}
// expected-error at 33 {{invalid universal character}}
diff --git a/clang/test/Preprocessor/utf8-allowed-chars.c b/clang/test/Preprocessor/utf8-allowed-chars.c
index b10ca74376bd4..db8a62e29ff6c 100644
--- a/clang/test/Preprocessor/utf8-allowed-chars.c
+++ b/clang/test/Preprocessor/utf8-allowed-chars.c
@@ -18,51 +18,41 @@ extern char x̀; // C11, C++11. Note that this does not have a composed form.
// Identifier initial characters
extern char ๐; // C++03, C11, C++11
-extern char ̀; // disallowed initially in C11/C++11, always in C99/C++03
-
-
-
-
+extern char ̀; // disallowed initially in C11/C++, always in C99
#if __cplusplus
-# if __cplusplus >= 201103L
-// C++11
-// expected-warning at 9 {{using this character in an identifier is incompatible with C++98}}
-// expected-warning at 10 {{using this character in an identifier is incompatible with C++98}}
-// expected-error at 13 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-warning at 14 {{using this character in an identifier is incompatible with C++98}}
-// expected-error at 21 {{expected unqualified-id}}
+// expected-error at 11 {{not allowed in an identifier}}
+// expected-error at 13 {{not allowed in an identifier}}
+// expected-error at 20 {{character <U+0E50> not allowed at the start of an identifier}}
+// expected-error at 21 {{character <U+0300> not allowed at the start of an identifier}}
+// expected-warning at 20 {{declaration does not declare anything}}
+// expected-warning at 21 {{declaration does not declare anything}}
-# else
-// C++03
-// expected-error at 9 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 10 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 13 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 14 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 21 {{non-ASCII characters are not allowed outside of literals and identifiers}} expected-warning at 21 {{declaration does not declare anything}}
-
-# endif
#else
# if __STDC_VERSION__ >= 201112L
// C11
// expected-warning at 9 {{using this character in an identifier is incompatible with C99}}
// expected-warning at 11 {{using this character in an identifier is incompatible with C99}}
-// expected-error at 13 {{non-ASCII characters are not allowed outside of literals and identifiers}}
+// expected-error at 13 {{not allowed in an identifier}}
// expected-warning at 14 {{using this character in an identifier is incompatible with C99}}
// expected-warning at 20 {{starting an identifier with this character is incompatible with C99}}
-// expected-error at 21 {{expected identifier}}
+// expected-warning at 21 {{declaration does not declare anything}}
+// expected-error at 21 {{not allowed at the start of an identifier}}
# else
// C99
-// expected-error at 9 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 11 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 13 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 14 {{non-ASCII characters are not allowed outside of literals and identifiers}}
-// expected-error at 20 {{expected identifier}}
-// expected-error at 21 {{non-ASCII characters are not allowed outside of literals and identifiers}} expected-warning at 21 {{declaration does not declare anything}}
+// expected-error at 9 {{not allowed in an identifier}}
+// expected-error at 11 {{not allowed in an identifier}}
+// expected-error at 13 {{not allowed in an identifier}}
+// expected-error at 14 {{not allowed in an identifier}}
+// expected-error at 20 {{character <U+0E50> not allowed at the start of an identifier}}
+// expected-error at 21 {{unexpected character <U+0300>}}
+// expected-warning at 20 {{declaration does not declare anything}}
+// expected-warning at 21 {{declaration does not declare anything}}
+
# endif
#endif
diff --git a/clang/www/cxx_dr_status.html b/clang/www/cxx_dr_status.html
index 57093c1cf5b0c..da63e2eabeb72 100755
--- a/clang/www/cxx_dr_status.html
+++ b/clang/www/cxx_dr_status.html
@@ -824,7 +824,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
<td><a href="https://wg21.link/cwg131">131</a></td>
<td>TC1</td>
<td>Typo in Lao characters</td>
- <td class="full" align="center">Yes</td>
+ <td class="na" align="center">Superseded by <a href="wg21.link/P1949">P1949</a></td>
</tr>
<tr id="132">
<td><a href="https://wg21.link/cwg132">132</a></td>
@@ -1527,7 +1527,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
<td><a href="https://wg21.link/cwg248">248</a></td>
<td>C++11</td>
<td>Identifier characters</td>
- <td class="full" align="center">Yes (C++11 onwards)</td>
+ <td class="na" align="center">Superseded by <a href="wg21.link/P1949">P1949</a></td>
</tr>
<tr id="249">
<td><a href="https://wg21.link/cwg249">249</a></td>
@@ -4020,7 +4020,7 @@ <h2 id="cxxdr">C++ defect report implementation status</h2>
<td><a href="https://wg21.link/cwg663">663</a></td>
<td>CD1</td>
<td>Valid Cyrillic identifier characters</td>
- <td class="full" align="center">Yes (C++11 onwards)</td>
+ <td class="na" align="center">Superseded by <a href="wg21.link/P1949">P1949</a></td>
</tr>
<tr id="664">
<td><a href="https://wg21.link/cwg664">664</a></td>
diff --git a/clang/www/cxx_status.html b/clang/www/cxx_status.html
index 3cbee7026c5c2..308648ab5aa4a 100755
--- a/clang/www/cxx_status.html
+++ b/clang/www/cxx_status.html
@@ -1314,7 +1314,7 @@ <h2 id="cxx23">C++2b implementation status</h2>
<tr>
<td>C++ identifier syntax using UAX 31</td>
<td><a href="https://wg21.link/P1949R7">P1949R7</a></td>
- <td class="none" align="center">No</td>
+ <td class="unreleased" align="center">Clang 14</td>
</tr>
<tr>
<td>Mixed string literal concatenation</td>
diff --git a/clang/www/make_cxx_dr_status b/clang/www/make_cxx_dr_status
index ee113779e32d2..ed727181c8b76 100755
--- a/clang/www/make_cxx_dr_status
+++ b/clang/www/make_cxx_dr_status
@@ -135,12 +135,16 @@ def availability(issue):
avail_style = ' class="na"'
elif status.startswith('sup '):
dup = status.split(' ', 1)[1]
- avail = 'Superseded by <a href="#%s">%s</a>' % (dup, dup)
- try:
- _, avail_style = availability(int(dup))
- except:
- print >>sys.stderr, "issue %s marked as sup %s" % (issue, dup)
- avail_style = ' class="none"'
+ if dup.startswith('P'):
+ avail = 'Superseded by <a href="https://wg21.link/%s">%s</a>' % (dup, dup)
+ avail_style = ' class="na"'
+ else:
+ avail = 'Superseded by <a href="#%s">%s</a>' % (dup, dup)
+ try:
+ _, avail_style = availability(int(dup))
+ except:
+ print >>sys.stderr, "issue %s marked as sup %s" % (issue, dup)
+ avail_style = ' class="none"'
elif status.startswith('dup '):
dup = int(status.split(' ', 1)[1])
avail = 'Duplicate of <a href="#%s">%s</a>' % (dup, dup)
More information about the cfe-commits
mailing list