Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update syntax to for-await-in syntax definitions #256

Merged
merged 1 commit into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/SwiftSyntax/gyb_generated/Misc.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1952,6 +1952,6 @@ extension Syntax {
extension SyntaxParser {
static func verifyNodeDeclarationHash() -> Bool {
return String(cString: swiftparse_syntax_structure_versioning_identifier()!) ==
"0741fb1877365f4e66ca42dc7d84d31d7ccdd35a"
"87a7d7e3a5692f5e70906dbde9053e64d7651ab0"
}
}
26 changes: 18 additions & 8 deletions Sources/SwiftSyntax/gyb_generated/SyntaxBuilders.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7252,7 +7252,7 @@ extension WhereClauseSyntax {

public struct ForInStmtSyntaxBuilder {
private var layout =
Array<RawSyntax?>(repeating: nil, count: 10)
Array<RawSyntax?>(repeating: nil, count: 12)

internal init() {}

Expand All @@ -7271,6 +7271,16 @@ public struct ForInStmtSyntaxBuilder {
layout[idx] = node.raw
}

public mutating func useTryKeyword(_ node: TokenSyntax) {
let idx = ForInStmtSyntax.Cursor.tryKeyword.rawValue
layout[idx] = node.raw
}

public mutating func useAwaitKeyword(_ node: TokenSyntax) {
let idx = ForInStmtSyntax.Cursor.awaitKeyword.rawValue
layout[idx] = node.raw
}

public mutating func useCaseKeyword(_ node: TokenSyntax) {
let idx = ForInStmtSyntax.Cursor.caseKeyword.rawValue
layout[idx] = node.raw
Expand Down Expand Up @@ -7310,17 +7320,17 @@ public struct ForInStmtSyntaxBuilder {
if (layout[2] == nil) {
layout[2] = RawSyntax.missingToken(TokenKind.forKeyword)
}
if (layout[4] == nil) {
layout[4] = RawSyntax.missing(SyntaxKind.pattern)
}
if (layout[6] == nil) {
layout[6] = RawSyntax.missingToken(TokenKind.inKeyword)
layout[6] = RawSyntax.missing(SyntaxKind.pattern)
}
if (layout[7] == nil) {
layout[7] = RawSyntax.missing(SyntaxKind.expr)
if (layout[8] == nil) {
layout[8] = RawSyntax.missingToken(TokenKind.inKeyword)
}
if (layout[9] == nil) {
layout[9] = RawSyntax.missing(SyntaxKind.codeBlock)
layout[9] = RawSyntax.missing(SyntaxKind.expr)
}
if (layout[11] == nil) {
layout[11] = RawSyntax.missing(SyntaxKind.codeBlock)
}

return .forRoot(RawSyntax.createAndCalcLength(kind: .forInStmt,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ extension SyntaxClassification {
return (.keyword, false)
case (.attribute, 1):
return (.attribute, false)
case (.forInStmt, 4):
return (.keyword, false)
case (.simpleTypeIdentifier, 0):
return (.typeIdentifier, false)
case (.memberTypeIdentifier, 2):
Expand Down
6 changes: 5 additions & 1 deletion Sources/SwiftSyntax/gyb_generated/SyntaxFactory.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3304,11 +3304,13 @@ public enum SyntaxFactory {
], length: .zero, presence: .present))
return WhereClauseSyntax(data)
}
public static func makeForInStmt(labelName: TokenSyntax?, labelColon: TokenSyntax?, forKeyword: TokenSyntax, caseKeyword: TokenSyntax?, pattern: PatternSyntax, typeAnnotation: TypeAnnotationSyntax?, inKeyword: TokenSyntax, sequenceExpr: ExprSyntax, whereClause: WhereClauseSyntax?, body: CodeBlockSyntax) -> ForInStmtSyntax {
public static func makeForInStmt(labelName: TokenSyntax?, labelColon: TokenSyntax?, forKeyword: TokenSyntax, tryKeyword: TokenSyntax?, awaitKeyword: TokenSyntax?, caseKeyword: TokenSyntax?, pattern: PatternSyntax, typeAnnotation: TypeAnnotationSyntax?, inKeyword: TokenSyntax, sequenceExpr: ExprSyntax, whereClause: WhereClauseSyntax?, body: CodeBlockSyntax) -> ForInStmtSyntax {
let layout: [RawSyntax?] = [
labelName?.raw,
labelColon?.raw,
forKeyword.raw,
tryKeyword?.raw,
awaitKeyword?.raw,
caseKeyword?.raw,
pattern.raw,
typeAnnotation?.raw,
Expand All @@ -3330,6 +3332,8 @@ public enum SyntaxFactory {
nil,
RawSyntax.missingToken(TokenKind.forKeyword),
nil,
nil,
nil,
RawSyntax.missing(SyntaxKind.pattern),
nil,
RawSyntax.missingToken(TokenKind.inKeyword),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,8 @@ public struct ForInStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
case labelName
case labelColon
case forKeyword
case tryKeyword
case awaitKeyword
case caseKeyword
case pattern
case typeAnnotation
Expand Down Expand Up @@ -1078,6 +1080,50 @@ public struct ForInStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
return ForInStmtSyntax(newData)
}

public var tryKeyword: TokenSyntax? {
get {
let childData = data.child(at: Cursor.tryKeyword,
parent: Syntax(self))
if childData == nil { return nil }
return TokenSyntax(childData!)
}
set(value) {
self = withTryKeyword(value)
}
}

/// Returns a copy of the receiver with its `tryKeyword` replaced.
/// - param newChild: The new `tryKeyword` to replace the node's
/// current `tryKeyword`, if present.
public func withTryKeyword(
_ newChild: TokenSyntax?) -> ForInStmtSyntax {
let raw = newChild?.raw
let newData = data.replacingChild(raw, at: Cursor.tryKeyword)
return ForInStmtSyntax(newData)
}

public var awaitKeyword: TokenSyntax? {
get {
let childData = data.child(at: Cursor.awaitKeyword,
parent: Syntax(self))
if childData == nil { return nil }
return TokenSyntax(childData!)
}
set(value) {
self = withAwaitKeyword(value)
}
}

/// Returns a copy of the receiver with its `awaitKeyword` replaced.
/// - param newChild: The new `awaitKeyword` to replace the node's
/// current `awaitKeyword`, if present.
public func withAwaitKeyword(
_ newChild: TokenSyntax?) -> ForInStmtSyntax {
let raw = newChild?.raw
let newData = data.replacingChild(raw, at: Cursor.awaitKeyword)
return ForInStmtSyntax(newData)
}

public var caseKeyword: TokenSyntax? {
get {
let childData = data.child(at: Cursor.caseKeyword,
Expand Down Expand Up @@ -1231,7 +1277,7 @@ public struct ForInStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {

public func _validateLayout() {
let rawChildren = Array(RawSyntaxChildren(Syntax(self)))
assert(rawChildren.count == 10)
assert(rawChildren.count == 12)
// Check child #0 child is TokenSyntax or missing
if let raw = rawChildren[0].raw {
let info = rawChildren[0].syntaxInfo
Expand Down Expand Up @@ -1265,56 +1311,72 @@ public struct ForInStmtSyntax: StmtSyntaxProtocol, SyntaxHashable {
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(TokenSyntax.self))
}
// Check child #4 child is PatternSyntax
assert(rawChildren[4].raw != nil)
// Check child #4 child is TokenSyntax or missing
if let raw = rawChildren[4].raw {
let info = rawChildren[4].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(PatternSyntax.self))
assert(syntaxChild.is(TokenSyntax.self))
}
// Check child #5 child is TypeAnnotationSyntax or missing
// Check child #5 child is TokenSyntax or missing
if let raw = rawChildren[5].raw {
let info = rawChildren[5].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(TypeAnnotationSyntax.self))
assert(syntaxChild.is(TokenSyntax.self))
}
// Check child #6 child is TokenSyntax
// Check child #6 child is PatternSyntax
assert(rawChildren[6].raw != nil)
if let raw = rawChildren[6].raw {
let info = rawChildren[6].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(TokenSyntax.self))
assert(syntaxChild.is(PatternSyntax.self))
}
// Check child #7 child is ExprSyntax
assert(rawChildren[7].raw != nil)
// Check child #7 child is TypeAnnotationSyntax or missing
if let raw = rawChildren[7].raw {
let info = rawChildren[7].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(ExprSyntax.self))
assert(syntaxChild.is(TypeAnnotationSyntax.self))
}
// Check child #8 child is WhereClauseSyntax or missing
// Check child #8 child is TokenSyntax
assert(rawChildren[8].raw != nil)
if let raw = rawChildren[8].raw {
let info = rawChildren[8].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(WhereClauseSyntax.self))
assert(syntaxChild.is(TokenSyntax.self))
}
// Check child #9 child is CodeBlockSyntax
// Check child #9 child is ExprSyntax
assert(rawChildren[9].raw != nil)
if let raw = rawChildren[9].raw {
let info = rawChildren[9].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(ExprSyntax.self))
}
// Check child #10 child is WhereClauseSyntax or missing
if let raw = rawChildren[10].raw {
let info = rawChildren[10].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(WhereClauseSyntax.self))
}
// Check child #11 child is CodeBlockSyntax
assert(rawChildren[11].raw != nil)
if let raw = rawChildren[11].raw {
let info = rawChildren[11].syntaxInfo
let absoluteRaw = AbsoluteRawSyntax(raw: raw, info: info)
let syntaxData = SyntaxData(absoluteRaw, parent: Syntax(self))
let syntaxChild = Syntax(syntaxData)
assert(syntaxChild.is(CodeBlockSyntax.self))
}
}
Expand All @@ -1326,6 +1388,8 @@ extension ForInStmtSyntax: CustomReflectable {
"labelName": labelName.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"labelColon": labelColon.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"forKeyword": Syntax(forKeyword).asProtocol(SyntaxProtocol.self),
"tryKeyword": tryKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"awaitKeyword": awaitKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"caseKeyword": caseKeyword.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
"pattern": Syntax(pattern).asProtocol(SyntaxProtocol.self),
"typeAnnotation": typeAnnotation.map(Syntax.init)?.asProtocol(SyntaxProtocol.self) as Any,
Expand Down