Skip to content

Commit a022a1a

Browse files
committed
Use literal: interpolation when refering to token text
1 parent 2156b1f commit a022a1a

File tree

3 files changed

+103
-103
lines changed

3 files changed

+103
-103
lines changed

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
6464
}
6565
} else if let text = tokenSpec.text {
6666
SwitchCaseSyntax("case .\(tokenSpec.varOrCaseName):") {
67-
StmtSyntax("return #\"\(raw: text)\"#")
67+
StmtSyntax("return \(literal: text)")
6868
}
6969
} else {
7070
SwitchCaseSyntax("case .\(tokenSpec.varOrCaseName)(let text):") {
@@ -90,7 +90,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
9090
}
9191
} else if let text = tokenSpec.text {
9292
SwitchCaseSyntax("case .\(tokenSpec.varOrCaseName):") {
93-
StmtSyntax("return #\"\(raw: text)\"#")
93+
StmtSyntax("return \(literal: text)")
9494
}
9595
}
9696
}
@@ -173,7 +173,7 @@ let tokenKindFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
173173
for tokenSpec in Token.allCases.map(\.spec) {
174174
if let text = tokenSpec.text {
175175
SwitchCaseSyntax("case .\(tokenSpec.varOrCaseName):") {
176-
StmtSyntax("return #\"\(raw: text)\"#")
176+
StmtSyntax("return \(literal: text)")
177177
}
178178
}
179179
}

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Utils
1818
let tokensFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
1919
try! ExtensionDeclSyntax("extension TokenSyntax") {
2020
for tokenSpec in Token.allCases.map(\.spec) {
21-
if let text = tokenSpec.text {
21+
if tokenSpec.text != nil {
2222
DeclSyntax(
2323
"""
2424
public static func \(tokenSpec.varOrCaseName)Token(

Sources/SwiftSyntax/generated/TokenKind.swift

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -70,73 +70,73 @@ public enum TokenKind: Hashable {
7070
public var text: String {
7171
switch self {
7272
case .arrow:
73-
return #"->"#
73+
return "->"
7474
case .atSign:
75-
return #"@"#
75+
return "@"
7676
case .backslash:
7777
return #"\"#
7878
case .backtick:
79-
return #"`"#
79+
return "`"
8080
case .binaryOperator(let text):
8181
return text
8282
case .colon:
83-
return #":"#
83+
return ":"
8484
case .comma:
85-
return #","#
85+
return ","
8686
case .dollarIdentifier(let text):
8787
return text
8888
case .ellipsis:
89-
return #"..."#
89+
return "..."
9090
case .endOfFile:
91-
return #""#
91+
return ""
9292
case .equal:
93-
return #"="#
93+
return "="
9494
case .exclamationMark:
95-
return #"!"#
95+
return "!"
9696
case .floatLiteral(let text):
9797
return text
9898
case .identifier(let text):
9999
return text
100100
case .infixQuestionMark:
101-
return #"?"#
101+
return "?"
102102
case .integerLiteral(let text):
103103
return text
104104
case .keyword(let assoc):
105105
return String(syntaxText: assoc.defaultText)
106106
case .leftAngle:
107-
return #"<"#
107+
return "<"
108108
case .leftBrace:
109-
return #"{"#
109+
return "{"
110110
case .leftParen:
111-
return #"("#
111+
return "("
112112
case .leftSquare:
113-
return #"["#
113+
return "["
114114
case .multilineStringQuote:
115115
return #"""""#
116116
case .period:
117-
return #"."#
117+
return "."
118118
case .postfixOperator(let text):
119119
return text
120120
case .postfixQuestionMark:
121-
return #"?"#
121+
return "?"
122122
case .pound:
123-
return #"#"#
123+
return "#"
124124
case .poundAvailable:
125-
return #"#available"#
125+
return "#available"
126126
case .poundElse:
127-
return #"#else"#
127+
return "#else"
128128
case .poundElseif:
129-
return #"#elseif"#
129+
return "#elseif"
130130
case .poundEndif:
131-
return #"#endif"#
131+
return "#endif"
132132
case .poundIf:
133-
return #"#if"#
133+
return "#if"
134134
case .poundSourceLocation:
135-
return #"#sourceLocation"#
135+
return "#sourceLocation"
136136
case .poundUnavailable:
137-
return #"#unavailable"#
137+
return "#unavailable"
138138
case .prefixAmpersand:
139-
return #"&"#
139+
return "&"
140140
case .prefixOperator(let text):
141141
return text
142142
case .rawStringPoundDelimiter(let text):
@@ -146,29 +146,29 @@ public enum TokenKind: Hashable {
146146
case .regexPoundDelimiter(let text):
147147
return text
148148
case .regexSlash:
149-
return #"/"#
149+
return "/"
150150
case .rightAngle:
151-
return #">"#
151+
return ">"
152152
case .rightBrace:
153-
return #"}"#
153+
return "}"
154154
case .rightParen:
155-
return #")"#
155+
return ")"
156156
case .rightSquare:
157-
return #"]"#
157+
return "]"
158158
case .semicolon:
159-
return #";"#
159+
return ";"
160160
case .shebang(let text):
161161
return text
162162
case .singleQuote:
163-
return #"'"#
163+
return "'"
164164
case .stringQuote:
165165
return #"""#
166166
case .stringSegment(let text):
167167
return text
168168
case .unknown(let text):
169169
return text
170170
case .wildcard:
171-
return #"_"#
171+
return "_"
172172
}
173173
}
174174

@@ -177,79 +177,79 @@ public enum TokenKind: Hashable {
177177
public var defaultText: SyntaxText? {
178178
switch self {
179179
case .arrow:
180-
return #"->"#
180+
return "->"
181181
case .atSign:
182-
return #"@"#
182+
return "@"
183183
case .backslash:
184184
return #"\"#
185185
case .backtick:
186-
return #"`"#
186+
return "`"
187187
case .colon:
188-
return #":"#
188+
return ":"
189189
case .comma:
190-
return #","#
190+
return ","
191191
case .ellipsis:
192-
return #"..."#
192+
return "..."
193193
case .endOfFile:
194-
return #""#
194+
return ""
195195
case .equal:
196-
return #"="#
196+
return "="
197197
case .exclamationMark:
198-
return #"!"#
198+
return "!"
199199
case .infixQuestionMark:
200-
return #"?"#
200+
return "?"
201201
case .keyword(let assoc):
202202
return assoc.defaultText
203203
case .leftAngle:
204-
return #"<"#
204+
return "<"
205205
case .leftBrace:
206-
return #"{"#
206+
return "{"
207207
case .leftParen:
208-
return #"("#
208+
return "("
209209
case .leftSquare:
210-
return #"["#
210+
return "["
211211
case .multilineStringQuote:
212212
return #"""""#
213213
case .period:
214-
return #"."#
214+
return "."
215215
case .postfixQuestionMark:
216-
return #"?"#
216+
return "?"
217217
case .pound:
218-
return #"#"#
218+
return "#"
219219
case .poundAvailable:
220-
return #"#available"#
220+
return "#available"
221221
case .poundElse:
222-
return #"#else"#
222+
return "#else"
223223
case .poundElseif:
224-
return #"#elseif"#
224+
return "#elseif"
225225
case .poundEndif:
226-
return #"#endif"#
226+
return "#endif"
227227
case .poundIf:
228-
return #"#if"#
228+
return "#if"
229229
case .poundSourceLocation:
230-
return #"#sourceLocation"#
230+
return "#sourceLocation"
231231
case .poundUnavailable:
232-
return #"#unavailable"#
232+
return "#unavailable"
233233
case .prefixAmpersand:
234-
return #"&"#
234+
return "&"
235235
case .regexSlash:
236-
return #"/"#
236+
return "/"
237237
case .rightAngle:
238-
return #">"#
238+
return ">"
239239
case .rightBrace:
240-
return #"}"#
240+
return "}"
241241
case .rightParen:
242-
return #")"#
242+
return ")"
243243
case .rightSquare:
244-
return #"]"#
244+
return "]"
245245
case .semicolon:
246-
return #";"#
246+
return ";"
247247
case .singleQuote:
248-
return #"'"#
248+
return "'"
249249
case .stringQuote:
250250
return #"""#
251251
case .wildcard:
252-
return #"_"#
252+
return "_"
253253
default:
254254
return ""
255255
}
@@ -537,77 +537,77 @@ public enum RawTokenKind: UInt8, Equatable, Hashable {
537537
public var defaultText: SyntaxText? {
538538
switch self {
539539
case .arrow:
540-
return #"->"#
540+
return "->"
541541
case .atSign:
542-
return #"@"#
542+
return "@"
543543
case .backslash:
544544
return #"\"#
545545
case .backtick:
546-
return #"`"#
546+
return "`"
547547
case .colon:
548-
return #":"#
548+
return ":"
549549
case .comma:
550-
return #","#
550+
return ","
551551
case .ellipsis:
552-
return #"..."#
552+
return "..."
553553
case .endOfFile:
554-
return #""#
554+
return ""
555555
case .equal:
556-
return #"="#
556+
return "="
557557
case .exclamationMark:
558-
return #"!"#
558+
return "!"
559559
case .infixQuestionMark:
560-
return #"?"#
560+
return "?"
561561
case .leftAngle:
562-
return #"<"#
562+
return "<"
563563
case .leftBrace:
564-
return #"{"#
564+
return "{"
565565
case .leftParen:
566-
return #"("#
566+
return "("
567567
case .leftSquare:
568-
return #"["#
568+
return "["
569569
case .multilineStringQuote:
570570
return #"""""#
571571
case .period:
572-
return #"."#
572+
return "."
573573
case .postfixQuestionMark:
574-
return #"?"#
574+
return "?"
575575
case .pound:
576-
return #"#"#
576+
return "#"
577577
case .poundAvailable:
578-
return #"#available"#
578+
return "#available"
579579
case .poundElse:
580-
return #"#else"#
580+
return "#else"
581581
case .poundElseif:
582-
return #"#elseif"#
582+
return "#elseif"
583583
case .poundEndif:
584-
return #"#endif"#
584+
return "#endif"
585585
case .poundIf:
586-
return #"#if"#
586+
return "#if"
587587
case .poundSourceLocation:
588-
return #"#sourceLocation"#
588+
return "#sourceLocation"
589589
case .poundUnavailable:
590-
return #"#unavailable"#
590+
return "#unavailable"
591591
case .prefixAmpersand:
592-
return #"&"#
592+
return "&"
593593
case .regexSlash:
594-
return #"/"#
594+
return "/"
595595
case .rightAngle:
596-
return #">"#
596+
return ">"
597597
case .rightBrace:
598-
return #"}"#
598+
return "}"
599599
case .rightParen:
600-
return #")"#
600+
return ")"
601601
case .rightSquare:
602-
return #"]"#
602+
return "]"
603603
case .semicolon:
604-
return #";"#
604+
return ";"
605605
case .singleQuote:
606-
return #"'"#
606+
return "'"
607607
case .stringQuote:
608608
return #"""#
609609
case .wildcard:
610-
return #"_"#
610+
return "_"
611611
default:
612612
return nil
613613
}

0 commit comments

Comments
 (0)