Skip to content

Commit 3094705

Browse files
inbelicFinn Plummer
authored andcommitted
[NFC][HLSL][RootSignature] add spelling of tokens to tokenkind.def
1 parent 48864a5 commit 3094705

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

clang/include/clang/Lex/HLSLRootSignatureTokenKinds.def

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
//===----------------------------------------------------------------------===//
1515

1616
#ifndef TOK
17-
#define TOK(X)
17+
#define TOK(X, SPELLING)
1818
#endif
1919
#ifndef PUNCTUATOR
20-
#define PUNCTUATOR(X,Y) TOK(pu_ ## X)
20+
#define PUNCTUATOR(X,Y) TOK(pu_ ## X, Y)
2121
#endif
2222
#ifndef KEYWORD
23-
#define KEYWORD(X) TOK(kw_ ## X)
23+
#define KEYWORD(X) TOK(kw_ ## X, #X)
2424
#endif
2525
#ifndef ENUM
26-
#define ENUM(NAME, LIT) TOK(en_ ## NAME)
26+
#define ENUM(NAME, LIT) TOK(en_ ## NAME, LIT)
2727
#endif
2828

2929
// Defines the various types of enum
@@ -49,15 +49,15 @@
4949
#endif
5050

5151
// General Tokens:
52-
TOK(invalid)
53-
TOK(end_of_stream)
54-
TOK(int_literal)
52+
TOK(invalid, "invalid identifier")
53+
TOK(end_of_stream, "end of stream")
54+
TOK(int_literal, "integer literal")
5555

5656
// Register Tokens:
57-
TOK(bReg)
58-
TOK(tReg)
59-
TOK(uReg)
60-
TOK(sReg)
57+
TOK(bReg, "b register")
58+
TOK(tReg, "t register")
59+
TOK(uReg, "u register")
60+
TOK(sReg, "s register")
6161

6262
// Punctuators:
6363
PUNCTUATOR(l_paren, '(')

clang/include/clang/Lex/LexHLSLRootSignature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace hlsl {
2424

2525
struct RootSignatureToken {
2626
enum Kind {
27-
#define TOK(X) X,
27+
#define TOK(X, SPELLING) X,
2828
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
2929
};
3030

clang/unittests/Lex/LexHLSLRootSignatureTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ TEST_F(LexHLSLRootSignatureTest, ValidLexAllTokensTest) {
113113

114114
SmallVector<hlsl::RootSignatureToken> Tokens;
115115
SmallVector<hlsl::TokenKind> Expected = {
116-
#define TOK(NAME) hlsl::TokenKind::NAME,
116+
#define TOK(NAME, SPELLING) hlsl::TokenKind::NAME,
117117
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
118118
};
119119

0 commit comments

Comments
 (0)