Skip to content

Commit 4dd6e27

Browse files
hamishknighthamishknight
committed
gyb-generate
1 parent 2e68a03 commit 4dd6e27

File tree

24 files changed

+12731
-12731
lines changed

24 files changed

+12731
-12731
lines changed

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,138 @@ public let EXPR_NODES: [Node] = [
542542
])
543543
]),
544544

545+
Node(name: "IfExpr",
546+
nameForDiagnostics: "'if' statement",
547+
kind: "Expr",
548+
traits: [
549+
"WithCodeBlock"
550+
],
551+
children: [
552+
Child(name: "IfKeyword",
553+
kind: "IfToken",
554+
tokenChoices: [
555+
"If"
556+
]),
557+
Child(name: "Conditions",
558+
kind: "ConditionElementList",
559+
collectionElementName: "Condition"),
560+
Child(name: "Body",
561+
kind: "CodeBlock"),
562+
Child(name: "ElseKeyword",
563+
kind: "ElseToken",
564+
isOptional: true,
565+
tokenChoices: [
566+
"Else"
567+
]),
568+
Child(name: "ElseBody",
569+
kind: "Syntax",
570+
isOptional: true,
571+
nodeChoices: [
572+
Child(name: "IfExpr",
573+
kind: "IfExpr"),
574+
Child(name: "CodeBlock",
575+
kind: "CodeBlock")
576+
])
577+
]),
578+
579+
Node(name: "SwitchExpr",
580+
nameForDiagnostics: "'switch' statement",
581+
kind: "Expr",
582+
traits: [
583+
"Braced"
584+
],
585+
children: [
586+
Child(name: "SwitchKeyword",
587+
kind: "SwitchToken",
588+
tokenChoices: [
589+
"Switch"
590+
]),
591+
Child(name: "Expression",
592+
kind: "Expr"),
593+
Child(name: "LeftBrace",
594+
kind: "LeftBraceToken",
595+
tokenChoices: [
596+
"LeftBrace"
597+
]),
598+
Child(name: "Cases",
599+
kind: "SwitchCaseList",
600+
collectionElementName: "Case"),
601+
Child(name: "RightBrace",
602+
kind: "RightBraceToken",
603+
tokenChoices: [
604+
"RightBrace"
605+
],
606+
requiresLeadingNewline: true)
607+
]),
608+
609+
Node(name: "SwitchCaseList",
610+
nameForDiagnostics: nil,
611+
kind: "SyntaxCollection",
612+
element: "Syntax",
613+
elementName: "SwitchCase",
614+
elementChoices: ["SwitchCase", "IfConfigDecl"],
615+
elementsSeparatedByNewline: true),
616+
617+
Node(name: "SwitchCase",
618+
nameForDiagnostics: "switch case",
619+
kind: "Syntax",
620+
traits: [
621+
"WithStatements"
622+
],
623+
children: [
624+
Child(name: "UnknownAttr",
625+
kind: "Attribute",
626+
isOptional: true),
627+
Child(name: "Label",
628+
kind: "Syntax",
629+
nodeChoices: [
630+
Child(name: "Default",
631+
kind: "SwitchDefaultLabel"),
632+
Child(name: "Case",
633+
kind: "SwitchCaseLabel")
634+
]),
635+
Child(name: "Statements",
636+
kind: "CodeBlockItemList",
637+
collectionElementName: "Statement",
638+
isIndented: true)
639+
]),
640+
641+
Node(name: "SwitchDefaultLabel",
642+
nameForDiagnostics: nil,
643+
kind: "Syntax",
644+
children: [
645+
Child(name: "DefaultKeyword",
646+
kind: "DefaultToken",
647+
tokenChoices: [
648+
"Default"
649+
]),
650+
Child(name: "Colon",
651+
kind: "ColonToken",
652+
tokenChoices: [
653+
"Colon"
654+
])
655+
]),
656+
657+
Node(name: "CaseItem",
658+
nameForDiagnostics: nil,
659+
kind: "Syntax",
660+
traits: [
661+
"WithTrailingComma"
662+
],
663+
children: [
664+
Child(name: "Pattern",
665+
kind: "Pattern"),
666+
Child(name: "WhereClause",
667+
kind: "WhereClause",
668+
isOptional: true),
669+
Child(name: "TrailingComma",
670+
kind: "CommaToken",
671+
isOptional: true,
672+
tokenChoices: [
673+
"Comma"
674+
])
675+
]),
676+
545677
Node(name: "UnresolvedTernaryExpr",
546678
nameForDiagnostics: nil,
547679
kind: "Expr",

‎CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift‎

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ public let STMT_NODES: [Node] = [
9191
kind: "Expr")
9292
]),
9393

94-
Node(name: "SwitchCaseList",
95-
nameForDiagnostics: nil,
96-
kind: "SyntaxCollection",
97-
element: "Syntax",
98-
elementName: "SwitchCase",
99-
elementChoices: ["SwitchCase", "IfConfigDecl"],
100-
elementsSeparatedByNewline: true),
101-
10294
Node(name: "RepeatWhileStmt",
10395
nameForDiagnostics: "'repeat' statement",
10496
kind: "Stmt",
@@ -212,36 +204,6 @@ public let STMT_NODES: [Node] = [
212204
kind: "CodeBlock")
213205
]),
214206

215-
Node(name: "SwitchStmt",
216-
nameForDiagnostics: "'switch' statement",
217-
kind: "Stmt",
218-
traits: [
219-
"Braced"
220-
],
221-
children: [
222-
Child(name: "SwitchKeyword",
223-
kind: "SwitchToken",
224-
tokenChoices: [
225-
"Switch"
226-
]),
227-
Child(name: "Expression",
228-
kind: "Expr"),
229-
Child(name: "LeftBrace",
230-
kind: "LeftBraceToken",
231-
tokenChoices: [
232-
"LeftBrace"
233-
]),
234-
Child(name: "Cases",
235-
kind: "SwitchCaseList",
236-
collectionElementName: "Case"),
237-
Child(name: "RightBrace",
238-
kind: "RightBraceToken",
239-
tokenChoices: [
240-
"RightBrace"
241-
],
242-
requiresLeadingNewline: true)
243-
]),
244-
245207
Node(name: "CatchClauseList",
246208
nameForDiagnostics: "'catch' clause",
247209
kind: "SyntaxCollection",
@@ -520,100 +482,6 @@ public let STMT_NODES: [Node] = [
520482
kind: "Expr")
521483
]),
522484

523-
Node(name: "IfStmt",
524-
nameForDiagnostics: "'if' statement",
525-
kind: "Stmt",
526-
traits: [
527-
"WithCodeBlock"
528-
],
529-
children: [
530-
Child(name: "IfKeyword",
531-
kind: "IfToken",
532-
tokenChoices: [
533-
"If"
534-
]),
535-
Child(name: "Conditions",
536-
kind: "ConditionElementList",
537-
collectionElementName: "Condition"),
538-
Child(name: "Body",
539-
kind: "CodeBlock"),
540-
Child(name: "ElseKeyword",
541-
kind: "ElseToken",
542-
isOptional: true,
543-
tokenChoices: [
544-
"Else"
545-
]),
546-
Child(name: "ElseBody",
547-
kind: "Syntax",
548-
isOptional: true,
549-
nodeChoices: [
550-
Child(name: "IfStmt",
551-
kind: "IfStmt"),
552-
Child(name: "CodeBlock",
553-
kind: "CodeBlock")
554-
])
555-
]),
556-
557-
Node(name: "SwitchCase",
558-
nameForDiagnostics: "switch case",
559-
kind: "Syntax",
560-
traits: [
561-
"WithStatements"
562-
],
563-
children: [
564-
Child(name: "UnknownAttr",
565-
kind: "Attribute",
566-
isOptional: true),
567-
Child(name: "Label",
568-
kind: "Syntax",
569-
nodeChoices: [
570-
Child(name: "Default",
571-
kind: "SwitchDefaultLabel"),
572-
Child(name: "Case",
573-
kind: "SwitchCaseLabel")
574-
]),
575-
Child(name: "Statements",
576-
kind: "CodeBlockItemList",
577-
collectionElementName: "Statement",
578-
isIndented: true)
579-
]),
580-
581-
Node(name: "SwitchDefaultLabel",
582-
nameForDiagnostics: nil,
583-
kind: "Syntax",
584-
children: [
585-
Child(name: "DefaultKeyword",
586-
kind: "DefaultToken",
587-
tokenChoices: [
588-
"Default"
589-
]),
590-
Child(name: "Colon",
591-
kind: "ColonToken",
592-
tokenChoices: [
593-
"Colon"
594-
])
595-
]),
596-
597-
Node(name: "CaseItem",
598-
nameForDiagnostics: nil,
599-
kind: "Syntax",
600-
traits: [
601-
"WithTrailingComma"
602-
],
603-
children: [
604-
Child(name: "Pattern",
605-
kind: "Pattern"),
606-
Child(name: "WhereClause",
607-
kind: "WhereClause",
608-
isOptional: true),
609-
Child(name: "TrailingComma",
610-
kind: "CommaToken",
611-
isOptional: true,
612-
tokenChoices: [
613-
"Comma"
614-
])
615-
]),
616-
617485
Node(name: "CatchItem",
618486
nameForDiagnostics: nil,
619487
kind: "Syntax",

‎Sources/SwiftBasicFormat/generated/BasicFormat.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ open class BasicFormat: SyntaxRewriter {
9393
return true
9494
case \MemberDeclBlockSyntax.rightBrace:
9595
return true
96-
case \SwitchStmtSyntax.rightBrace:
96+
case \SwitchExprSyntax.rightBrace:
9797
return true
9898
default:
9999
return putNextTokenOnNewLine

‎Sources/SwiftParser/gyb_generated/Parser+Entry.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,25 @@ extension PatternSyntax: SyntaxParseable {
8181
}
8282
}
8383

84-
extension MemberDeclBlockSyntax: SyntaxParseable {
84+
extension SwitchCaseSyntax: SyntaxParseable {
8585
public static func parse(from parser: inout Parser) -> Self {
86-
let node = parser.parseMemberDeclList()
86+
let node = parser.parseSwitchCase()
8787
let raw = RawSyntax(parser.parseRemainder(into: node))
8888
return Syntax(raw: raw).cast(Self.self)
8989
}
9090
}
9191

92-
extension SourceFileSyntax: SyntaxParseable {
92+
extension MemberDeclBlockSyntax: SyntaxParseable {
9393
public static func parse(from parser: inout Parser) -> Self {
94-
let node = parser.parseSourceFile()
94+
let node = parser.parseMemberDeclList()
9595
let raw = RawSyntax(parser.parseRemainder(into: node))
9696
return Syntax(raw: raw).cast(Self.self)
9797
}
9898
}
9999

100-
extension SwitchCaseSyntax: SyntaxParseable {
100+
extension SourceFileSyntax: SyntaxParseable {
101101
public static func parse(from parser: inout Parser) -> Self {
102-
let node = parser.parseSwitchCase()
102+
let node = parser.parseSourceFile()
103103
let raw = RawSyntax(parser.parseRemainder(into: node))
104104
return Syntax(raw: raw).cast(Self.self)
105105
}

‎Sources/SwiftSyntax/Documentation.docc/gyb_generated/SwiftSyntax.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
9191
- <doc:SwiftSyntax/RepeatWhileStmtSyntax>
9292
- <doc:SwiftSyntax/GuardStmtSyntax>
9393
- <doc:SwiftSyntax/ForInStmtSyntax>
94-
- <doc:SwiftSyntax/SwitchStmtSyntax>
9594
- <doc:SwiftSyntax/DoStmtSyntax>
9695
- <doc:SwiftSyntax/ReturnStmtSyntax>
9796
- <doc:SwiftSyntax/YieldStmtSyntax>
9897
- <doc:SwiftSyntax/FallthroughStmtSyntax>
9998
- <doc:SwiftSyntax/BreakStmtSyntax>
10099
- <doc:SwiftSyntax/DeclarationStmtSyntax>
101100
- <doc:SwiftSyntax/ThrowStmtSyntax>
102-
- <doc:SwiftSyntax/IfStmtSyntax>
103101
- <doc:SwiftSyntax/PoundAssertStmtSyntax>
104102

105103
### Expressions
@@ -135,6 +133,8 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
135133
- <doc:SwiftSyntax/DictionaryExprSyntax>
136134
- <doc:SwiftSyntax/IntegerLiteralExprSyntax>
137135
- <doc:SwiftSyntax/BooleanLiteralExprSyntax>
136+
- <doc:SwiftSyntax/IfExprSyntax>
137+
- <doc:SwiftSyntax/SwitchExprSyntax>
138138
- <doc:SwiftSyntax/UnresolvedTernaryExprSyntax>
139139
- <doc:SwiftSyntax/TernaryExprSyntax>
140140
- <doc:SwiftSyntax/MemberAccessExprSyntax>
@@ -298,6 +298,10 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
298298
- <doc:SwiftSyntax/TupleExprElementSyntax>
299299
- <doc:SwiftSyntax/ArrayElementSyntax>
300300
- <doc:SwiftSyntax/DictionaryElementSyntax>
301+
- <doc:SwiftSyntax/SwitchCaseListSyntax>
302+
- <doc:SwiftSyntax/SwitchCaseSyntax>
303+
- <doc:SwiftSyntax/SwitchDefaultLabelSyntax>
304+
- <doc:SwiftSyntax/CaseItemSyntax>
301305
- <doc:SwiftSyntax/ClosureCaptureItemSyntax>
302306
- <doc:SwiftSyntax/ClosureCaptureItemListSyntax>
303307
- <doc:SwiftSyntax/ClosureCaptureSignatureSyntax>
@@ -385,7 +389,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
385389
- <doc:SwiftSyntax/OpaqueReturnTypeOfAttributeArgumentsSyntax>
386390
- <doc:SwiftSyntax/ConventionAttributeArgumentsSyntax>
387391
- <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
388-
- <doc:SwiftSyntax/SwitchCaseListSyntax>
389392
- <doc:SwiftSyntax/WhereClauseSyntax>
390393
- <doc:SwiftSyntax/CatchClauseListSyntax>
391394
- <doc:SwiftSyntax/YieldListSyntax>
@@ -398,9 +401,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
398401
- <doc:SwiftSyntax/UnavailabilityConditionSyntax>
399402
- <doc:SwiftSyntax/HasSymbolConditionSyntax>
400403
- <doc:SwiftSyntax/ConditionElementListSyntax>
401-
- <doc:SwiftSyntax/SwitchCaseSyntax>
402-
- <doc:SwiftSyntax/SwitchDefaultLabelSyntax>
403-
- <doc:SwiftSyntax/CaseItemSyntax>
404404
- <doc:SwiftSyntax/CatchItemSyntax>
405405
- <doc:SwiftSyntax/SwitchCaseLabelSyntax>
406406
- <doc:SwiftSyntax/CatchClauseSyntax>

0 commit comments

Comments
 (0)