Skip to content

Commit 593d01f

Browse files
authored
Merge pull request swiftlang#298 from rintaro/5.5-syntax-postfixifconfig-sr14929
[5.5] Degyb for nullable PostfixIfConfigExpr.base
2 parents 9a8d3d8 + a419267 commit 593d01f

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

Sources/SwiftSyntax/gyb_generated/Misc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1960,6 +1960,6 @@ extension Syntax {
19601960
extension SyntaxParser {
19611961
static func verifyNodeDeclarationHash() -> Bool {
19621962
return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
1963-
"a66df9d44b9128aee3da17e9b0d2aed27ce7ec61"
1963+
"8ee080f1fdc3f07356b951a1f0c9354704b003f2"
19641964
}
19651965
}

Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2962,9 +2962,6 @@ public struct PostfixIfConfigExprSyntaxBuilder {
29622962
}
29632963

29642964
internal mutating func buildData() -> SyntaxData {
2965-
if (layout[0] == nil) {
2966-
layout[0] = RawSyntax.missing(SyntaxKind.expr)
2967-
}
29682965
if (layout[1] == nil) {
29692966
layout[1] = RawSyntax.missing(SyntaxKind.ifConfigDecl)
29702967
}

Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,9 +1418,9 @@ public enum SyntaxFactory {
14181418
], length: .zero, presence: .present))
14191419
return ObjcSelectorExprSyntax(data)
14201420
}
1421-
public static func makePostfixIfConfigExpr(base: ExprSyntax, config: IfConfigDeclSyntax) -> PostfixIfConfigExprSyntax {
1421+
public static func makePostfixIfConfigExpr(base: ExprSyntax?, config: IfConfigDeclSyntax) -> PostfixIfConfigExprSyntax {
14221422
let layout: [RawSyntax?] = [
1423-
base.raw,
1423+
base?.raw,
14241424
config.raw,
14251425
]
14261426
let raw = RawSyntax.createAndCalcLength(kind: SyntaxKind.postfixIfConfigExpr,
@@ -1432,7 +1432,7 @@ public enum SyntaxFactory {
14321432
public static func makeBlankPostfixIfConfigExpr() -> PostfixIfConfigExprSyntax {
14331433
let data = SyntaxData.forRoot(RawSyntax.create(kind: .postfixIfConfigExpr,
14341434
layout: [
1435-
RawSyntax.missing(SyntaxKind.expr),
1435+
nil,
14361436
RawSyntax.missing(SyntaxKind.ifConfigDecl),
14371437
], length: .zero, presence: .present))
14381438
return PostfixIfConfigExprSyntax(data)

Sources/SwiftSyntax/gyb_generated/syntax_nodes/SyntaxExprNodes.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5275,10 +5275,11 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
52755275
return Swift.type(of: self)
52765276
}
52775277

5278-
public var base: ExprSyntax {
5278+
public var base: ExprSyntax? {
52795279
get {
52805280
let childData = data.child(at: Cursor.base,
52815281
parent: Syntax(self))
5282+
if childData == nil { return nil }
52825283
return ExprSyntax(childData!)
52835284
}
52845285
set(value) {
@@ -5291,7 +5292,7 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
52915292
/// current `base`, if present.
52925293
public func withBase(
52935294
_ newChild: ExprSyntax?) -> PostfixIfConfigExprSyntax {
5294-
let raw = newChild?.raw ?? RawSyntax.missing(SyntaxKind.expr)
5295+
let raw = newChild?.raw
52955296
let newData = data.replacingChild(raw, at: Cursor.base)
52965297
return PostfixIfConfigExprSyntax(newData)
52975298
}
@@ -5321,8 +5322,7 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
53215322
public func _validateLayout() {
53225323
let rawChildren = Array(RawSyntaxChildren(Syntax(self)))
53235324
assert(rawChildren.count == 2)
5324-
// Check child #0 child is ExprSyntax
5325-
assert(rawChildren[0].raw != nil)
5325+
// Check child #0 child is ExprSyntax or missing
53265326
if let raw = rawChildren[0].raw {
53275327
let info = rawChildren[0].syntaxInfo
53285328
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
@@ -5345,7 +5345,7 @@ public struct PostfixIfConfigExprSyntax: ExprSyntaxProtocol, SyntaxHashable {
53455345
extension PostfixIfConfigExprSyntax: CustomReflectable {
53465346
public var customMirror: Mirror {
53475347
return Mirror(self, children: [
5348-
"base": Syntax(base).asProtocol(SyntaxProtocol.self),
5348+
"base": base.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
53495349
"config": Syntax(config).asProtocol(SyntaxProtocol.self),
53505350
])
53515351
}

0 commit comments

Comments
 (0)