Skip to content

Commit 0d6f074

Browse files
rintarorintaro
authored
Merge pull request #77089 from rintaro/astgen-postfix-if-config-expr
[ASTGen] Generate postfix #if expressions
2 parents cb205b6 + ce0bbb1 commit 0d6f074

File tree

2 files changed

+234
-18
lines changed

2 files changed

+234
-18
lines changed

‎lib/ASTGen/Sources/ASTGen/Exprs.swift

Lines changed: 104 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ func isExprMigrated(_ node: ExprSyntax) -> Bool {
4747
.editorPlaceholderExpr, .floatLiteralExpr, .forceUnwrapExpr, .functionCallExpr,
4848
.genericSpecializationExpr, .ifExpr, .infixOperatorExpr, .inOutExpr,
4949
.integerLiteralExpr, .isExpr, .memberAccessExpr, .nilLiteralExpr, .optionalChainingExpr,
50-
.packElementExpr, .packExpansionExpr, .patternExpr,
50+
.packElementExpr, .packExpansionExpr, .patternExpr, .postfixIfConfigExpr,
5151
.postfixOperatorExpr, .prefixOperatorExpr, .regexLiteralExpr, .sequenceExpr,
5252
.simpleStringLiteralExpr, .subscriptCallExpr, .stringLiteralExpr, .superExpr,
5353
.switchExpr, .tryExpr, .tupleExpr, .typeExpr, .unresolvedAsExpr, .unresolvedIsExpr,
5454
.unresolvedTernaryExpr, .ternaryExpr:
5555
break
5656

5757
// Known unimplemented kinds.
58-
case .keyPathExpr, .macroExpansionExpr, .postfixIfConfigExpr:
58+
case .keyPathExpr, .macroExpansionExpr:
5959
return false
6060

6161
// Unknown expr kinds.
@@ -147,8 +147,8 @@ extension ASTGenVisitor {
147147
return self.generate(packExpansionExpr: node).asExpr
148148
case .patternExpr(let node):
149149
return self.generate(patternExpr: node).asExpr
150-
case .postfixIfConfigExpr:
151-
break
150+
case .postfixIfConfigExpr(let node):
151+
return self.generate(postfixIfConfigExpr: node)
152152
case .postfixOperatorExpr(let node):
153153
return self.generate(postfixOperatorExpr: node).asExpr
154154
case .prefixOperatorExpr(let node):
@@ -187,6 +187,45 @@ extension ASTGenVisitor {
187187
preconditionFailure("isExprMigrated() mismatch")
188188
}
189189

190+
func generate(expr node: ExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedExpr {
191+
if let postfixIfConfigBaseExpr {
192+
// Generating tail part of a postfix #if expression.
193+
return self.generatePostfixIfConfigExprSuffix(expr: node, baseExpr: postfixIfConfigBaseExpr)
194+
} else {
195+
return self.generate(expr: node)
196+
}
197+
}
198+
199+
/// Generate function for interior of postfix #if expressions. The base expression is provided by the caller.
200+
///
201+
/// ```
202+
/// foo // <- baseExpr
203+
/// #if FLAG
204+
/// .bar(arg)?[idx]!++ // <- node
205+
/// #endif
206+
/// ```
207+
func generatePostfixIfConfigExprSuffix(expr node: ExprSyntax, baseExpr: BridgedExpr) -> BridgedExpr {
208+
switch node.as(ExprSyntaxEnum.self) {
209+
case .memberAccessExpr(let node):
210+
return self.generate(memberAccessExpr: node, postfixIfConfigBaseExpr: baseExpr)
211+
case .postfixIfConfigExpr(let node):
212+
return self.generate(postfixIfConfigExpr: node, postfixIfConfigBaseExpr: baseExpr)
213+
case .functionCallExpr(let node):
214+
return self.generate(functionCallExpr: node, postfixIfConfigBaseExpr: baseExpr).asExpr
215+
case .subscriptCallExpr(let node):
216+
return self.generate(subscriptCallExpr: node, postfixIfConfigBaseExpr: baseExpr).asExpr
217+
case .postfixOperatorExpr(let node):
218+
return self.generate(postfixOperatorExpr: node, postfixIfConfigBaseExpr: baseExpr).asExpr
219+
case .optionalChainingExpr(let node):
220+
return self.generate(optionalChainingExpr: node, postfixIfConfigBaseExpr: baseExpr).asExpr
221+
case .forceUnwrapExpr(let node):
222+
return self.generate(forceUnwrapExpr: node, postfixIfConfigBaseExpr: baseExpr).asExpr
223+
default:
224+
// FIXME: Diagnose 'invalid expression for a postfix #if expression'
225+
preconditionFailure("expected postfix expression suffix in #if expression clause")
226+
}
227+
}
228+
190229
func generate(arrowExpr node: ArrowExprSyntax) -> BridgedArrowExpr {
191230
let asyncLoc: BridgedSourceLoc
192231
let throwsLoc: BridgedSourceLoc
@@ -291,10 +330,10 @@ extension ASTGenVisitor {
291330
)
292331
}
293332

294-
func generate(forceUnwrapExpr node: ForceUnwrapExprSyntax) -> BridgedForceValueExpr {
333+
func generate(forceUnwrapExpr node: ForceUnwrapExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedForceValueExpr {
295334
return .createParsed(
296335
self.ctx,
297-
subExpr: self.generate(expr: node.expression),
336+
subExpr: self.generate(expr: node.expression, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr),
298337
exclaimLoc: self.generateSourceLoc(node.exclamationMark)
299338
)
300339
}
@@ -364,7 +403,7 @@ extension ASTGenVisitor {
364403
)
365404
}
366405

367-
func generate(functionCallExpr node: FunctionCallExprSyntax) -> BridgedCallExpr {
406+
func generate(functionCallExpr node: FunctionCallExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedCallExpr {
368407
if !node.arguments.isEmpty || node.trailingClosure == nil {
369408
if node.leftParen == nil {
370409
self.diagnose(
@@ -378,7 +417,7 @@ extension ASTGenVisitor {
378417
}
379418
}
380419

381-
let callee = generate(expr: node.calledExpression)
420+
let callee = self.generate(expr: node.calledExpression, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr)
382421
let arguments = generateArgumentList(
383422
leftParen: node.leftParen,
384423
labeledExprList: node.arguments,
@@ -496,25 +535,40 @@ extension ASTGenVisitor {
496535
)
497536
}
498537

499-
func generate(memberAccessExpr node: MemberAccessExprSyntax) -> BridgedExpr {
538+
func generate(memberAccessExpr node: MemberAccessExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedExpr {
539+
let baseExpr: BridgedExpr?
540+
if let base = node.base {
541+
baseExpr = self.generate(expr: base, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr)
542+
} else if let postfixIfConfigBaseExpr {
543+
// Dot member syntax right after '#if' line. E.g.
544+
// foo // <- postfixIfConfigBaseExpr
545+
// #if FLAG
546+
// .bar // <- Generating this.
547+
// .baz
548+
// #endif
549+
baseExpr = postfixIfConfigBaseExpr
550+
} else {
551+
baseExpr = nil
552+
}
553+
500554
let dotLoc = self.generateSourceLoc(node.period)
501555
let nameAndLoc = generateDeclNameRef(declReferenceExpr: node.declName)
502556

503-
if let base = node.base {
557+
if let baseExpr {
504558
if node.declName.baseName.keywordKind == .`self` {
505559
// TODO: Diagnose if there's arguments
506560
assert(node.declName.argumentNames == nil)
507561

508562
return BridgedDotSelfExpr.createParsed(
509563
self.ctx,
510-
subExpr: self.generate(expr: base),
564+
subExpr: baseExpr,
511565
dotLoc: dotLoc,
512566
selfLoc: self.generateSourceLoc(node.declName)
513567
).asExpr
514568
} else {
515569
return BridgedUnresolvedDotExpr.createParsed(
516570
self.ctx,
517-
base: self.generate(expr: base),
571+
base: baseExpr,
518572
dotLoc: dotLoc,
519573
name: nameAndLoc.name,
520574
nameLoc: nameAndLoc.loc
@@ -547,10 +601,10 @@ extension ASTGenVisitor {
547601
)
548602
}
549603

550-
func generate(optionalChainingExpr node: OptionalChainingExprSyntax) -> BridgedBindOptionalExpr {
604+
func generate(optionalChainingExpr node: OptionalChainingExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedBindOptionalExpr {
551605
return .createParsed(
552606
self.ctx,
553-
subExpr: self.generate(expr: node.expression),
607+
subExpr: self.generate(expr: node.expression, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr),
554608
questionLoc: self.generateSourceLoc(node.questionMark)
555609
)
556610
}
@@ -599,14 +653,46 @@ extension ASTGenVisitor {
599653
)
600654
}
601655

602-
func generate(postfixOperatorExpr node: PostfixOperatorExprSyntax) -> BridgedPostfixUnaryExpr {
656+
func generate(postfixIfConfigExpr node: PostfixIfConfigExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedExpr {
657+
let baseExpr: BridgedExpr
658+
if let base = node.base {
659+
baseExpr = self.generate(expr: base, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr)
660+
} else if let postfixIfConfigBaseExpr {
661+
// This is a nested postifx #if expression. E.g.
662+
//
663+
// foo // <- postfixIfConfigBaseExpr
664+
// #if FLAG
665+
// #if FLAG2 // <- This
666+
// .bar
667+
// #endif
668+
// .baz
669+
// #endif
670+
//
671+
baseExpr = postfixIfConfigBaseExpr
672+
} else {
673+
// FIXME: Diagnostics
674+
preconditionFailure("expected PostfixIfConfigExprSyntax.base not nil")
675+
}
676+
677+
guard let active = self.activeClause(in: node.config) else {
678+
return baseExpr
679+
}
680+
guard case .postfixExpression(let parsedTail) = active.elements else {
681+
// FIXME: Diagnostics
682+
preconditionFailure("expected postfixExpression in IfConfigClauseSyntax.Elements")
683+
}
684+
return self.generatePostfixIfConfigExprSuffix(expr: parsedTail, baseExpr: baseExpr)
685+
}
686+
687+
func generate(postfixOperatorExpr node: PostfixOperatorExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedPostfixUnaryExpr {
688+
let operand = self.generate(expr: node.expression, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr)
603689
return .createParsed(
604690
self.ctx,
605691
operator: self.createOperatorRefExpr(
606692
token: node.operator,
607693
kind: .postfixOperator
608694
).asExpr,
609-
operand: self.generate(expr: node.expression)
695+
operand: operand
610696
)
611697
}
612698

@@ -690,8 +776,8 @@ extension ASTGenVisitor {
690776
).asExpr
691777
}
692778

693-
func generate(subscriptCallExpr node: SubscriptCallExprSyntax) -> BridgedSubscriptExpr {
694-
let callee = generate(expr: node.calledExpression)
779+
func generate(subscriptCallExpr node: SubscriptCallExprSyntax, postfixIfConfigBaseExpr: BridgedExpr? = nil) -> BridgedSubscriptExpr {
780+
let callee = generate(expr: node.calledExpression, postfixIfConfigBaseExpr: postfixIfConfigBaseExpr)
695781
let arguments = generateArgumentList(
696782
leftParen: node.leftSquare,
697783
labeledExprList: node.arguments,

‎test/ASTGen/if_config_expr.swift

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
// RUN: %target-typecheck-verify-swift -enable-experimental-feature ParserASTGen -D CONDITION_1
2+
3+
// -enable-experimental-feature requires an asserts build
4+
// REQUIRES: asserts
5+
// REQUIRES: swift_swift_parser
6+
7+
postfix operator ++
8+
postfix func ++ (_: Int) -> Int { 0 }
9+
10+
struct OneResult {}
11+
struct TwoResult {}
12+
13+
protocol MyProto {
14+
func optionalMethod() -> [Int]?
15+
}
16+
struct MyStruct {
17+
var optionalMember: MyProto? { nil }
18+
func methodOne() -> OneResult { OneResult() }
19+
func methodTwo() -> TwoResult { TwoResult() }
20+
}
21+
22+
func globalFunc<T>(_ arg: T) -> T { arg }
23+
24+
func testBasic(baseExpr: MyStruct) {
25+
baseExpr
26+
#if CONDITION_1
27+
.methodOne() // expected-warning {{result of call to 'methodOne()' is unused}}
28+
#else
29+
.methodTwo()
30+
#endif
31+
}
32+
33+
MyStruct()
34+
#if CONDITION_1
35+
.methodOne() // expected-warning {{result of call to 'methodOne()' is unused}}
36+
#else
37+
.methodTwo()
38+
#endif
39+
40+
41+
func testInvalidContent(baseExpr: MyStruct, otherExpr: Int) {
42+
baseExpr // expected-warning {{expression of type 'MyStruct' is unused}}
43+
#if CONDITION_1
44+
{ print(1) } // expected-error {{closure expression is unused}}
45+
#endif
46+
47+
baseExpr // expected-warning {{expression of type 'MyStruct' is unused}}
48+
#if CONDITION_1
49+
+ otherExpr // expected-error {{unexpected code '+ otherExpr' in conditional compilation block}}
50+
#endif
51+
52+
baseExpr
53+
#if CONDITION_1
54+
.methodOne() // expected-warning {{result of call to 'methodOne()' is unused}}
55+
56+
print("debug") // expected-error {{unexpected code 'print("debug")' in conditional compilation block}}
57+
#endif
58+
}
59+
60+
func testExprKind(baseExpr: MyStruct, idx: Int) {
61+
baseExpr
62+
#if CONDITION_1
63+
.optionalMember?.optionalMethod()![idx]++ // expected-warning {{result of operator '++' is unused}}
64+
#else
65+
.otherMethod(arg) {
66+
//...
67+
}
68+
#endif
69+
70+
baseExpr
71+
#if CONDITION_1
72+
.methodOne() + 12 // expected-error {{unexpected code '+ 12' in conditional compilation block}}
73+
// expected-warning@-1 {{result of call to 'methodOne()' is unused}}
74+
#endif
75+
}
76+
77+
func emptyElse(baseExpr: MyStruct) {
78+
baseExpr
79+
#if CONDITION_1
80+
.methodOne() // expected-warning {{result of call to 'methodOne()' is unused}}
81+
#elseif CONDITION_2
82+
// OK. Do nothing.
83+
#endif
84+
85+
baseExpr
86+
#if CONDITION_1
87+
.methodOne() // expected-warning {{result of call to 'methodOne()' is unused}}
88+
#elseif CONDITION_2
89+
return // expected-error {{unexpected 'return' keyword in conditional compilation block}}
90+
#endif
91+
}
92+
93+
func consecutiveIfConfig(baseExpr: MyStruct) {
94+
baseExpr
95+
#if CONDITION_1
96+
.methodOne()
97+
#endif
98+
#if CONDITION_2
99+
.methodTwo()
100+
#endif
101+
.unknownMethod() // expected-error {{value of type 'OneResult' has no member 'unknownMethod'}}
102+
}
103+
104+
func nestedIfConfig(baseExpr: MyStruct) {
105+
baseExpr
106+
#if CONDITION_1
107+
#if CONDITION_2
108+
.methodOne()
109+
#endif
110+
#if CONDITION_1
111+
.methodTwo() // expected-warning {{result of call to 'methodTwo()' is unused}}
112+
#endif
113+
#else
114+
.unknownMethod1()
115+
#if CONDITION_2
116+
.unknownMethod2()
117+
#endif
118+
#endif
119+
}
120+
121+
func ifconfigExprInExpr(baseExpr: MyStruct) {
122+
globalFunc( // expected-warning {{result of call to 'globalFunc' is unused}}
123+
baseExpr
124+
#if CONDITION_1
125+
.methodOne()
126+
#else
127+
.methodTwo()
128+
#endif
129+
)
130+
}

0 commit comments

Comments
 (0)