Merge pull request #1228 from hamishknight/express-yourself

Author: hamishknight

CodeGeneration/Sources/SyntaxSupport/gyb_generated/ExprNodes.swift

@@ -362,6 +362,122 @@ public let EXPR_NODES: [Node] = [
                kind: .token(choices: [.keyword(text: "true"), .keyword(text: "false")]))
        ]),
 
+  Node(name: "IfExpr",
+       nameForDiagnostics: "'if' statement",
+       kind: "Expr",
+       traits: [
+         "WithCodeBlock"
+       ],
+       children: [
+         Child(name: "IfKeyword",
+               kind: .token(choices: [.keyword(text: "if")])),
+         Child(name: "Conditions",
+               kind: .collection(kind: "ConditionElementList", collectionElementName: "Condition")),
+         Child(name: "Body",
+               kind: .node(kind: "CodeBlock")),
+         Child(name: "ElseKeyword",
+               kind: .node(kind: "ElseToken"),
+               isOptional: true),
+         Child(name: "ElseBody",
+               kind: .nodeChoices(choices: [
+                 Child(name: "IfExpr",
+                       kind: .node(kind: "IfExpr")),
+                 Child(name: "CodeBlock",
+                       kind: .node(kind: "CodeBlock"))
+               ]),
+               isOptional: true)
+       ]),
+
+  Node(name: "SwitchExpr",
+       nameForDiagnostics: "'switch' statement",
+       kind: "Expr",
+       traits: [
+         "Braced"
+       ],
+       children: [
+         Child(name: "SwitchKeyword",
+               kind: .token(choices: [.keyword(text: "switch")])),
+         Child(name: "Expression",
+               kind: .node(kind: "Expr")),
+         Child(name: "LeftBrace",
+               kind: .token(choices: [.token(tokenKind: "LeftBraceToken")])),
+         Child(name: "Cases",
+               kind: .collection(kind: "SwitchCaseList", collectionElementName: "Case")),
+         Child(name: "RightBrace",
+               kind: .token(choices: [.token(tokenKind: "RightBraceToken")]),
+               requiresLeadingNewline: true)
+       ]),
+
+  Node(name: "SwitchCaseList",
+       nameForDiagnostics: nil,
+       kind: "SyntaxCollection",
+       element: "Syntax",
+       elementName: "SwitchCase",
+       elementChoices: ["SwitchCase", "IfConfigDecl"],
+       elementsSeparatedByNewline: true),
+
+  Node(name: "SwitchCase",
+       nameForDiagnostics: "switch case",
+       kind: "Syntax",
+       traits: [
+         "WithStatements"
+       ],
+       parserFunction: "parseSwitchCase",
+       children: [
+         Child(name: "UnknownAttr",
+               kind: .node(kind: "Attribute"),
+               isOptional: true),
+         Child(name: "Label",
+               kind: .nodeChoices(choices: [
+                 Child(name: "Default",
+                       kind: .node(kind: "SwitchDefaultLabel")),
+                 Child(name: "Case",
+                       kind: .node(kind: "SwitchCaseLabel"))
+               ])),
+         Child(name: "Statements",
+               kind: .collection(kind: "CodeBlockItemList", collectionElementName: "Statement"),
+               isIndented: true)
+       ]),
+
+  Node(name: "SwitchCaseLabel",
+       nameForDiagnostics: nil,
+       kind: "Syntax",
+       children: [
+         Child(name: "CaseKeyword",
+               kind: .token(choices: [.keyword(text: "case")])),
+         Child(name: "CaseItems",
+               kind: .collection(kind: "CaseItemList", collectionElementName: "CaseItem")),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
+       ]),
+
+  Node(name: "SwitchDefaultLabel",
+       nameForDiagnostics: nil,
+       kind: "Syntax",
+       children: [
+         Child(name: "DefaultKeyword",
+               kind: .token(choices: [.keyword(text: "default")])),
+         Child(name: "Colon",
+               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
+       ]),
+
+  Node(name: "CaseItem",
+       nameForDiagnostics: nil,
+       kind: "Syntax",
+       traits: [
+         "WithTrailingComma"
+       ],
+       children: [
+         Child(name: "Pattern",
+               kind: .node(kind: "Pattern")),
+         Child(name: "WhereClause",
+               kind: .node(kind: "WhereClause"),
+               isOptional: true),
+         Child(name: "TrailingComma",
+               kind: .token(choices: [.token(tokenKind: "CommaToken")]),
+               isOptional: true)
+       ]),
+
   Node(name: "UnresolvedTernaryExpr",
        nameForDiagnostics: "ternary operator",
        kind: "Expr",

CodeGeneration/Sources/SyntaxSupport/gyb_generated/StmtNodes.swift

@@ -25,6 +25,14 @@ public let STMT_NODES: [Node] = [
                kind: .node(kind: "Stmt"))
        ]),
 
+  Node(name: "ExpressionStmt",
+       nameForDiagnostics: "expression",
+       kind: "Stmt",
+       children: [
+         Child(name: "Expression",
+               kind: .node(kind: "Expr"))
+       ]),
+
   Node(name: "ContinueStmt",
        nameForDiagnostics: "'continue' statement",
        kind: "Stmt",
@@ -64,14 +72,6 @@ public let STMT_NODES: [Node] = [
                kind: .node(kind: "CodeBlock"))
        ]),
 
-  Node(name: "SwitchCaseList",
-       nameForDiagnostics: nil,
-       kind: "SyntaxCollection",
-       element: "Syntax",
-       elementName: "SwitchCase",
-       elementChoices: ["SwitchCase", "IfConfigDecl"],
-       elementsSeparatedByNewline: true),
-
   Node(name: "RepeatWhileStmt",
        nameForDiagnostics: "'repeat' statement",
        kind: "Stmt",
@@ -151,26 +151,6 @@ public let STMT_NODES: [Node] = [
                kind: .node(kind: "CodeBlock"))
        ]),
 
-  Node(name: "SwitchStmt",
-       nameForDiagnostics: "'switch' statement",
-       kind: "Stmt",
-       traits: [
-         "Braced"
-       ],
-       children: [
-         Child(name: "SwitchKeyword",
-               kind: .token(choices: [.keyword(text: "switch")])),
-         Child(name: "Expression",
-               kind: .node(kind: "Expr")),
-         Child(name: "LeftBrace",
-               kind: .token(choices: [.token(tokenKind: "LeftBraceToken")])),
-         Child(name: "Cases",
-               kind: .collection(kind: "SwitchCaseList", collectionElementName: "Case")),
-         Child(name: "RightBrace",
-               kind: .token(choices: [.token(tokenKind: "RightBraceToken")]),
-               requiresLeadingNewline: true)
-       ]),
-
   Node(name: "CatchClauseList",
        nameForDiagnostics: "'catch' clause",
        kind: "SyntaxCollection",
@@ -342,82 +322,6 @@ public let STMT_NODES: [Node] = [
                kind: .node(kind: "Expr"))
        ]),
 
-  Node(name: "IfStmt",
-       nameForDiagnostics: "'if' statement",
-       kind: "Stmt",
-       traits: [
-         "WithCodeBlock"
-       ],
-       children: [
-         Child(name: "IfKeyword",
-               kind: .token(choices: [.keyword(text: "if")])),
-         Child(name: "Conditions",
-               kind: .collection(kind: "ConditionElementList", collectionElementName: "Condition")),
-         Child(name: "Body",
-               kind: .node(kind: "CodeBlock")),
-         Child(name: "ElseKeyword",
-               kind: .node(kind: "ElseToken"),
-               isOptional: true),
-         Child(name: "ElseBody",
-               kind: .nodeChoices(choices: [
-                 Child(name: "IfStmt",
-                       kind: .node(kind: "IfStmt")),
-                 Child(name: "CodeBlock",
-                       kind: .node(kind: "CodeBlock"))
-               ]),
-               isOptional: true)
-       ]),
-
-  Node(name: "SwitchCase",
-       nameForDiagnostics: "switch case",
-       kind: "Syntax",
-       traits: [
-         "WithStatements"
-       ],
-       parserFunction: "parseSwitchCase",
-       children: [
-         Child(name: "UnknownAttr",
-               kind: .node(kind: "Attribute"),
-               isOptional: true),
-         Child(name: "Label",
-               kind: .nodeChoices(choices: [
-                 Child(name: "Default",
-                       kind: .node(kind: "SwitchDefaultLabel")),
-                 Child(name: "Case",
-                       kind: .node(kind: "SwitchCaseLabel"))
-               ])),
-         Child(name: "Statements",
-               kind: .collection(kind: "CodeBlockItemList", collectionElementName: "Statement"),
-               isIndented: true)
-       ]),
-
-  Node(name: "SwitchDefaultLabel",
-       nameForDiagnostics: nil,
-       kind: "Syntax",
-       children: [
-         Child(name: "DefaultKeyword",
-               kind: .token(choices: [.keyword(text: "default")])),
-         Child(name: "Colon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
-       ]),
-
-  Node(name: "CaseItem",
-       nameForDiagnostics: nil,
-       kind: "Syntax",
-       traits: [
-         "WithTrailingComma"
-       ],
-       children: [
-         Child(name: "Pattern",
-               kind: .node(kind: "Pattern")),
-         Child(name: "WhereClause",
-               kind: .node(kind: "WhereClause"),
-               isOptional: true),
-         Child(name: "TrailingComma",
-               kind: .token(choices: [.token(tokenKind: "CommaToken")]),
-               isOptional: true)
-       ]),
-
   Node(name: "CatchItem",
        nameForDiagnostics: nil,
        kind: "Syntax",
@@ -436,18 +340,6 @@ public let STMT_NODES: [Node] = [
                isOptional: true)
        ]),
 
-  Node(name: "SwitchCaseLabel",
-       nameForDiagnostics: nil,
-       kind: "Syntax",
-       children: [
-         Child(name: "CaseKeyword",
-               kind: .token(choices: [.keyword(text: "case")])),
-         Child(name: "CaseItems",
-               kind: .collection(kind: "CaseItemList", collectionElementName: "CaseItem")),
-         Child(name: "Colon",
-               kind: .token(choices: [.token(tokenKind: "ColonToken")]))
-       ]),
-
   Node(name: "CatchClause",
        nameForDiagnostics: "'catch' clause",
        kind: "Syntax",

Sources/SwiftBasicFormat/generated/BasicFormat.swift

@@ -114,7 +114,7 @@ open class BasicFormat: SyntaxRewriter {
       return true
     case \MemberDeclBlockSyntax.rightBrace: 
       return true
-    case \SwitchStmtSyntax.rightBrace: 
+    case \SwitchExprSyntax.rightBrace: 
       return true
     default: 
       return putNextTokenOnNewLine