Skip to content

Commit ea6b1d9

Browse files
hamishknighthamishknight
committed
gyb-generate
1 parent e3f9fac commit ea6b1d9

File tree

24 files changed

+12728
-12728
lines changed

24 files changed

+12728
-12728
lines changed

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

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,139 @@ 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+
parserFunction: "parseSwitchCase",
624+
children: [
625+
Child(name: "UnknownAttr",
626+
kind: "Attribute",
627+
isOptional: true),
628+
Child(name: "Label",
629+
kind: "Syntax",
630+
nodeChoices: [
631+
Child(name: "Default",
632+
kind: "SwitchDefaultLabel"),
633+
Child(name: "Case",
634+
kind: "SwitchCaseLabel")
635+
]),
636+
Child(name: "Statements",
637+
kind: "CodeBlockItemList",
638+
collectionElementName: "Statement",
639+
isIndented: true)
640+
]),
641+
642+
Node(name: "SwitchDefaultLabel",
643+
nameForDiagnostics: nil,
644+
kind: "Syntax",
645+
children: [
646+
Child(name: "DefaultKeyword",
647+
kind: "DefaultToken",
648+
tokenChoices: [
649+
"Default"
650+
]),
651+
Child(name: "Colon",
652+
kind: "ColonToken",
653+
tokenChoices: [
654+
"Colon"
655+
])
656+
]),
657+
658+
Node(name: "CaseItem",
659+
nameForDiagnostics: nil,
660+
kind: "Syntax",
661+
traits: [
662+
"WithTrailingComma"
663+
],
664+
children: [
665+
Child(name: "Pattern",
666+
kind: "Pattern"),
667+
Child(name: "WhereClause",
668+
kind: "WhereClause",
669+
isOptional: true),
670+
Child(name: "TrailingComma",
671+
kind: "CommaToken",
672+
isOptional: true,
673+
tokenChoices: [
674+
"Comma"
675+
])
676+
]),
677+
545678
Node(name: "UnresolvedTernaryExpr",
546679
nameForDiagnostics: nil,
547680
kind: "Expr",

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

Lines changed: 0 additions & 133 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,101 +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-
parserFunction: "parseSwitchCase",
564-
children: [
565-
Child(name: "UnknownAttr",
566-
kind: "Attribute",
567-
isOptional: true),
568-
Child(name: "Label",
569-
kind: "Syntax",
570-
nodeChoices: [
571-
Child(name: "Default",
572-
kind: "SwitchDefaultLabel"),
573-
Child(name: "Case",
574-
kind: "SwitchCaseLabel")
575-
]),
576-
Child(name: "Statements",
577-
kind: "CodeBlockItemList",
578-
collectionElementName: "Statement",
579-
isIndented: true)
580-
]),
581-
582-
Node(name: "SwitchDefaultLabel",
583-
nameForDiagnostics: nil,
584-
kind: "Syntax",
585-
children: [
586-
Child(name: "DefaultKeyword",
587-
kind: "DefaultToken",
588-
tokenChoices: [
589-
"Default"
590-
]),
591-
Child(name: "Colon",
592-
kind: "ColonToken",
593-
tokenChoices: [
594-
"Colon"
595-
])
596-
]),
597-
598-
Node(name: "CaseItem",
599-
nameForDiagnostics: nil,
600-
kind: "Syntax",
601-
traits: [
602-
"WithTrailingComma"
603-
],
604-
children: [
605-
Child(name: "Pattern",
606-
kind: "Pattern"),
607-
Child(name: "WhereClause",
608-
kind: "WhereClause",
609-
isOptional: true),
610-
Child(name: "TrailingComma",
611-
kind: "CommaToken",
612-
isOptional: true,
613-
tokenChoices: [
614-
"Comma"
615-
])
616-
]),
617-
618485
Node(name: "CatchItem",
619486
nameForDiagnostics: nil,
620487
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>
@@ -296,6 +296,10 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
296296
- <doc:SwiftSyntax/TupleExprElementSyntax>
297297
- <doc:SwiftSyntax/ArrayElementSyntax>
298298
- <doc:SwiftSyntax/DictionaryElementSyntax>
299+
- <doc:SwiftSyntax/SwitchCaseListSyntax>
300+
- <doc:SwiftSyntax/SwitchCaseSyntax>
301+
- <doc:SwiftSyntax/SwitchDefaultLabelSyntax>
302+
- <doc:SwiftSyntax/CaseItemSyntax>
299303
- <doc:SwiftSyntax/ClosureCaptureItemSyntax>
300304
- <doc:SwiftSyntax/ClosureCaptureItemListSyntax>
301305
- <doc:SwiftSyntax/ClosureCaptureSignatureSyntax>
@@ -383,7 +387,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
383387
- <doc:SwiftSyntax/OpaqueReturnTypeOfAttributeArgumentsSyntax>
384388
- <doc:SwiftSyntax/ConventionAttributeArgumentsSyntax>
385389
- <doc:SwiftSyntax/ConventionWitnessMethodAttributeArgumentsSyntax>
386-
- <doc:SwiftSyntax/SwitchCaseListSyntax>
387390
- <doc:SwiftSyntax/WhereClauseSyntax>
388391
- <doc:SwiftSyntax/CatchClauseListSyntax>
389392
- <doc:SwiftSyntax/YieldListSyntax>
@@ -396,9 +399,6 @@ allows Swift tools to parse, inspect, generate, and transform Swift source code.
396399
- <doc:SwiftSyntax/UnavailabilityConditionSyntax>
397400
- <doc:SwiftSyntax/HasSymbolConditionSyntax>
398401
- <doc:SwiftSyntax/ConditionElementListSyntax>
399-
- <doc:SwiftSyntax/SwitchCaseSyntax>
400-
- <doc:SwiftSyntax/SwitchDefaultLabelSyntax>
401-
- <doc:SwiftSyntax/CaseItemSyntax>
402402
- <doc:SwiftSyntax/CatchItemSyntax>
403403
- <doc:SwiftSyntax/SwitchCaseLabelSyntax>
404404
- <doc:SwiftSyntax/CatchClauseSyntax>

0 commit comments

Comments
 (0)