https://github.com/Tsche created https://github.com/llvm/llvm-project/pull/208867
This patch moves the `TokenKey` enum closer to where it's actually used. This is in preparation to generate it from tablegen once the definition has been moved. >From b169efb79f5e621b2e95ae6f08c170986be8b16f Mon Sep 17 00:00:00 2001 From: Matthias Wippich <[email protected]> Date: Sat, 11 Jul 2026 00:48:30 +0200 Subject: [PATCH] [clang][NFC] move TokenKey to TokenKinds.h --- clang/include/clang/Basic/IdentifierTable.h | 38 --------------------- clang/include/clang/Basic/TokenKinds.h | 38 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/clang/include/clang/Basic/IdentifierTable.h b/clang/include/clang/Basic/IdentifierTable.h index c2520618d9b96..79a2aecebf55b 100644 --- a/clang/include/clang/Basic/IdentifierTable.h +++ b/clang/include/clang/Basic/IdentifierTable.h @@ -46,44 +46,6 @@ class LangOptions; class MultiKeywordSelector; class SourceLocation; -/// Constants for TokenKinds.def -enum TokenKey : unsigned { - KEYC99 = 0x1, - KEYCXX = 0x2, - KEYCXX11 = 0x4, - KEYGNU = 0x8, - KEYMS = 0x10, - BOOLSUPPORT = 0x20, - KEYALTIVEC = 0x40, - KEYNOCXX = 0x80, - KEYBORLAND = 0x100, - KEYOPENCLC = 0x200, - KEYC23 = 0x400, - KEYNOMS18 = 0x800, - KEYNOOPENCL = 0x1000, - WCHARSUPPORT = 0x2000, - HALFSUPPORT = 0x4000, - CHAR8SUPPORT = 0x8000, - KEYOBJC = 0x10000, - KEYZVECTOR = 0x20000, - KEYCOROUTINES = 0x40000, - KEYMODULES = 0x80000, - KEYCXX20 = 0x100000, - KEYOPENCLCXX = 0x200000, - KEYMSCOMPAT = 0x400000, - KEYSYCL = 0x800000, - KEYCUDA = 0x1000000, - KEYZOS = 0x2000000, - KEYHLSL = 0x4000000, - KEYFIXEDPOINT = 0x8000000, - KEYDEFERTS = 0x10000000, - KEYNOHLSL = 0x20000000, - KEYMAX = KEYNOHLSL, // The maximum key - KEYALLCXX = KEYCXX | KEYCXX11 | KEYCXX20, - KEYALL = (KEYMAX | (KEYMAX - 1)) & ~KEYNOMS18 & ~KEYNOOPENCL & - ~KEYNOHLSL // KEYNOMS18, KEYNOOPENCL, KEYNOHLSL excluded. -}; - /// How a keyword is treated in the selected standard. This enum is ordered /// intentionally so that the value that 'wins' is the most 'permissive'. enum KeywordStatus { diff --git a/clang/include/clang/Basic/TokenKinds.h b/clang/include/clang/Basic/TokenKinds.h index 5a2d673a9995b..89b2d43076511 100644 --- a/clang/include/clang/Basic/TokenKinds.h +++ b/clang/include/clang/Basic/TokenKinds.h @@ -21,6 +21,44 @@ namespace clang { +/// Constants for TokenKinds.def +enum TokenKey : unsigned { + KEYC99 = 0x1, + KEYCXX = 0x2, + KEYCXX11 = 0x4, + KEYGNU = 0x8, + KEYMS = 0x10, + BOOLSUPPORT = 0x20, + KEYALTIVEC = 0x40, + KEYNOCXX = 0x80, + KEYBORLAND = 0x100, + KEYOPENCLC = 0x200, + KEYC23 = 0x400, + KEYNOMS18 = 0x800, + KEYNOOPENCL = 0x1000, + WCHARSUPPORT = 0x2000, + HALFSUPPORT = 0x4000, + CHAR8SUPPORT = 0x8000, + KEYOBJC = 0x10000, + KEYZVECTOR = 0x20000, + KEYCOROUTINES = 0x40000, + KEYMODULES = 0x80000, + KEYCXX20 = 0x100000, + KEYOPENCLCXX = 0x200000, + KEYMSCOMPAT = 0x400000, + KEYSYCL = 0x800000, + KEYCUDA = 0x1000000, + KEYZOS = 0x2000000, + KEYHLSL = 0x4000000, + KEYFIXEDPOINT = 0x8000000, + KEYDEFERTS = 0x10000000, + KEYNOHLSL = 0x20000000, + KEYMAX = KEYNOHLSL, // The maximum key + KEYALLCXX = KEYCXX | KEYCXX11 | KEYCXX20, + KEYALL = (KEYMAX | (KEYMAX - 1)) & ~KEYNOMS18 & ~KEYNOOPENCL & + ~KEYNOHLSL // KEYNOMS18, KEYNOOPENCL, KEYNOHLSL excluded. +}; + namespace tok { /// Provides a simple uniform namespace for tokens from all C languages. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
