[clang] [Clang] allow `` `@$ `` in raw string delimiters in C++26 (PR #93216)
via cfe-commits
cfe-commits at lists.llvm.org
Thu May 23 09:58:13 PDT 2024
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff 558cb29feae6011beb2d384b1ef094bb9f7f2c27 556c622275c630b74c0f9000c5c599ff665595e1 -- clang/test/Lexer/cxx2c-raw-strings.cpp clang/include/clang/Basic/CharInfo.h clang/lib/Basic/CharInfo.cpp clang/lib/Lex/Lexer.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/include/clang/Basic/CharInfo.h b/clang/include/clang/Basic/CharInfo.h
index 4d90528f79..c1b76f1f0e 100644
--- a/clang/include/clang/Basic/CharInfo.h
+++ b/clang/include/clang/Basic/CharInfo.h
@@ -19,16 +19,16 @@ namespace charinfo {
extern const uint16_t InfoTable[256];
enum {
- CHAR_HORZ_WS = 0x0001, // '\t', '\f', '\v'. Note, no '\0'
- CHAR_VERT_WS = 0x0002, // '\r', '\n'
- CHAR_SPACE = 0x0004, // ' '
- CHAR_DIGIT = 0x0008, // 0-9
- CHAR_XLETTER = 0x0010, // a-f,A-F
- CHAR_UPPER = 0x0020, // A-Z
- CHAR_LOWER = 0x0040, // a-z
- CHAR_UNDER = 0x0080, // _
- CHAR_PERIOD = 0x0100, // .
- CHAR_PUNCT = 0x0200, // {}[]#<>%:;?*+-/^&|~!=,"'`$@()
+ CHAR_HORZ_WS = 0x0001, // '\t', '\f', '\v'. Note, no '\0'
+ CHAR_VERT_WS = 0x0002, // '\r', '\n'
+ CHAR_SPACE = 0x0004, // ' '
+ CHAR_DIGIT = 0x0008, // 0-9
+ CHAR_XLETTER = 0x0010, // a-f,A-F
+ CHAR_UPPER = 0x0020, // A-Z
+ CHAR_LOWER = 0x0040, // a-z
+ CHAR_UNDER = 0x0080, // _
+ CHAR_PERIOD = 0x0100, // .
+ CHAR_PUNCT = 0x0200, // {}[]#<>%:;?*+-/^&|~!=,"'`$@()
};
enum {
diff --git a/clang/lib/Basic/CharInfo.cpp b/clang/lib/Basic/CharInfo.cpp
index 26d693b8e9..bdfd8ebc01 100644
--- a/clang/lib/Basic/CharInfo.cpp
+++ b/clang/lib/Basic/CharInfo.cpp
@@ -13,68 +13,64 @@ using namespace clang::charinfo;
// Statically initialize CharInfo table based on ASCII character set
// Reference: FreeBSD 7.2 /usr/share/misc/ascii
const uint16_t clang::charinfo::InfoTable[256] = {
- // 0 NUL 1 SOH 2 STX 3 ETX
- // 4 EOT 5 ENQ 6 ACK 7 BEL
- 0 , 0 , 0 , 0 ,
- 0 , 0 , 0 , 0 ,
- // 8 BS 9 HT 10 NL 11 VT
- //12 NP 13 CR 14 SO 15 SI
- 0 , CHAR_HORZ_WS, CHAR_VERT_WS, CHAR_HORZ_WS,
- CHAR_HORZ_WS, CHAR_VERT_WS, 0 , 0 ,
- //16 DLE 17 DC1 18 DC2 19 DC3
- //20 DC4 21 NAK 22 SYN 23 ETB
- 0 , 0 , 0 , 0 ,
- 0 , 0 , 0 , 0 ,
- //24 CAN 25 EM 26 SUB 27 ESC
- //28 FS 29 GS 30 RS 31 US
- 0 , 0 , 0 , 0 ,
- 0 , 0 , 0 , 0 ,
- //32 SP 33 ! 34 " 35 #
- //36 $ 37 % 38 & 39 '
- CHAR_SPACE , CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT ,
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT ,
- //40 ( 41 ) 42 * 43 +
- //44 , 45 - 46 . 47 /
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT ,
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PERIOD , CHAR_PUNCT ,
- //48 0 49 1 50 2 51 3
- //52 4 53 5 54 6 55 7
- CHAR_DIGIT , CHAR_DIGIT , CHAR_DIGIT , CHAR_DIGIT ,
- CHAR_DIGIT , CHAR_DIGIT , CHAR_DIGIT , CHAR_DIGIT ,
- //56 8 57 9 58 : 59 ;
- //60 < 61 = 62 > 63 ?
- CHAR_DIGIT , CHAR_DIGIT , CHAR_PUNCT , CHAR_PUNCT ,
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT ,
- //64 @ 65 A 66 B 67 C
- //68 D 69 E 70 F 71 G
- CHAR_PUNCT , CHAR_XUPPER , CHAR_XUPPER , CHAR_XUPPER ,
- CHAR_XUPPER , CHAR_XUPPER , CHAR_XUPPER , CHAR_UPPER ,
- //72 H 73 I 74 J 75 K
- //76 L 77 M 78 N 79 O
- CHAR_UPPER , CHAR_UPPER , CHAR_UPPER , CHAR_UPPER ,
- CHAR_UPPER , CHAR_UPPER , CHAR_UPPER , CHAR_UPPER ,
- //80 P 81 Q 82 R 83 S
- //84 T 85 U 86 V 87 W
- CHAR_UPPER , CHAR_UPPER , CHAR_UPPER , CHAR_UPPER ,
- CHAR_UPPER , CHAR_UPPER , CHAR_UPPER , CHAR_UPPER ,
- //88 X 89 Y 90 Z 91 [
- //92 \ 93 ] 94 ^ 95 _
- CHAR_UPPER , CHAR_UPPER , CHAR_UPPER , CHAR_PUNCT ,
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT , CHAR_UNDER ,
- //96 ` 97 a 98 b 99 c
- //100 d 101 e 102 f 103 g
- CHAR_PUNCT , CHAR_XLOWER , CHAR_XLOWER , CHAR_XLOWER ,
- CHAR_XLOWER , CHAR_XLOWER , CHAR_XLOWER , CHAR_LOWER ,
- //104 h 105 i 106 j 107 k
- //108 l 109 m 110 n 111 o
- CHAR_LOWER , CHAR_LOWER , CHAR_LOWER , CHAR_LOWER ,
- CHAR_LOWER , CHAR_LOWER , CHAR_LOWER , CHAR_LOWER ,
- //112 p 113 q 114 r 115 s
- //116 t 117 u 118 v 119 w
- CHAR_LOWER , CHAR_LOWER , CHAR_LOWER , CHAR_LOWER ,
- CHAR_LOWER , CHAR_LOWER , CHAR_LOWER , CHAR_LOWER ,
- //120 x 121 y 122 z 123 {
- //124 | 125 } 126 ~ 127 DEL
- CHAR_LOWER , CHAR_LOWER , CHAR_LOWER , CHAR_PUNCT ,
- CHAR_PUNCT , CHAR_PUNCT , CHAR_PUNCT , 0
-};
+ // 0 NUL 1 SOH 2 STX 3 ETX
+ // 4 EOT 5 ENQ 6 ACK 7 BEL
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // 8 BS 9 HT 10 NL 11 VT
+ // 12 NP 13 CR 14 SO 15 SI
+ 0, CHAR_HORZ_WS, CHAR_VERT_WS, CHAR_HORZ_WS, CHAR_HORZ_WS, CHAR_VERT_WS, 0,
+ 0,
+ // 16 DLE 17 DC1 18 DC2 19 DC3
+ // 20 DC4 21 NAK 22 SYN 23 ETB
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // 24 CAN 25 EM 26 SUB 27 ESC
+ // 28 FS 29 GS 30 RS 31 US
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // 32 SP 33 ! 34 " 35 #
+ // 36 $ 37 % 38 & 39 '
+ CHAR_SPACE, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT,
+ CHAR_PUNCT, CHAR_PUNCT,
+ // 40 ( 41 ) 42 * 43 +
+ // 44 , 45 - 46 . 47 /
+ CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT,
+ CHAR_PERIOD, CHAR_PUNCT,
+ // 48 0 49 1 50 2 51 3
+ // 52 4 53 5 54 6 55 7
+ CHAR_DIGIT, CHAR_DIGIT, CHAR_DIGIT, CHAR_DIGIT, CHAR_DIGIT, CHAR_DIGIT,
+ CHAR_DIGIT, CHAR_DIGIT,
+ // 56 8 57 9 58 : 59 ;
+ // 60 < 61 = 62 > 63 ?
+ CHAR_DIGIT, CHAR_DIGIT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT,
+ CHAR_PUNCT, CHAR_PUNCT,
+ // 64 @ 65 A 66 B 67 C
+ // 68 D 69 E 70 F 71 G
+ CHAR_PUNCT, CHAR_XUPPER, CHAR_XUPPER, CHAR_XUPPER, CHAR_XUPPER, CHAR_XUPPER,
+ CHAR_XUPPER, CHAR_UPPER,
+ // 72 H 73 I 74 J 75 K
+ // 76 L 77 M 78 N 79 O
+ CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER,
+ CHAR_UPPER, CHAR_UPPER,
+ // 80 P 81 Q 82 R 83 S
+ // 84 T 85 U 86 V 87 W
+ CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_UPPER,
+ CHAR_UPPER, CHAR_UPPER,
+ // 88 X 89 Y 90 Z 91 [
+ // 92 \ 93 ] 94 ^ 95 _
+ CHAR_UPPER, CHAR_UPPER, CHAR_UPPER, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT,
+ CHAR_PUNCT, CHAR_UNDER,
+ // 96 ` 97 a 98 b 99 c
+ // 100 d 101 e 102 f 103 g
+ CHAR_PUNCT, CHAR_XLOWER, CHAR_XLOWER, CHAR_XLOWER, CHAR_XLOWER, CHAR_XLOWER,
+ CHAR_XLOWER, CHAR_LOWER,
+ // 104 h 105 i 106 j 107 k
+ // 108 l 109 m 110 n 111 o
+ CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER,
+ CHAR_LOWER, CHAR_LOWER,
+ // 112 p 113 q 114 r 115 s
+ // 116 t 117 u 118 v 119 w
+ CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_LOWER,
+ CHAR_LOWER, CHAR_LOWER,
+ // 120 x 121 y 122 z 123 {
+ // 124 | 125 } 126 ~ 127 DEL
+ CHAR_LOWER, CHAR_LOWER, CHAR_LOWER, CHAR_PUNCT, CHAR_PUNCT, CHAR_PUNCT,
+ CHAR_PUNCT, 0};
``````````
</details>
https://github.com/llvm/llvm-project/pull/93216
More information about the cfe-commits
mailing list