Introduce IfExprSyntax

This replaces IfStmtSyntax, and will be wrapped in
an ExpressionStmtSyntax when used as a statement.

Author: hamishknight

gyb_syntax_support/ExprNodes.py

@@ -285,6 +285,28 @@
                    ])
          ]),
 
+    # if-expr -> identifier? ':'? 'if' condition-list code-block
+    #   else-clause ';'?
+    #
+    # This node represents both an 'if' expression, as well as an 'if' statement
+    # when wrapped in a ExpressionStmt node.
+    Node('IfExpr', name_for_diagnostics="'if' statement", kind='Expr',
+         traits=['WithCodeBlock'],
+         children=[
+             Child('IfKeyword', kind='IfToken'),
+             Child('Conditions', kind='ConditionElementList',
+                   collection_element_name='Condition'),
+             Child('Body', kind='CodeBlock', name_for_diagnostics='body'),
+             Child('ElseKeyword', kind='ElseToken',
+                   is_optional=True),
+             Child('ElseBody', kind='Syntax', name_for_diagnostics='else body',
+                   node_choices=[
+                       Child('IfExpr', kind='IfExpr'),
+                       Child('CodeBlock', kind='CodeBlock'),
+                   ],
+                   is_optional=True),
+         ]),
+
     # ? expr :
     # Ternary expression without the condition and the second choice.
     # NOTE: This appears only in SequenceExpr.

gyb_syntax_support/StmtNodes.py

@@ -271,25 +271,6 @@
              Child('Expression', kind='Expr'),
          ]),
 
-    # if-stmt -> identifier? ':'? 'if' condition-list code-block
-    #   else-clause ';'?
-    Node('IfStmt', name_for_diagnostics="'if' statement", kind='Stmt',
-         traits=['WithCodeBlock'],
-         children=[
-             Child('IfKeyword', kind='IfToken'),
-             Child('Conditions', kind='ConditionElementList',
-                   collection_element_name='Condition'),
-             Child('Body', kind='CodeBlock', name_for_diagnostics='body'),
-             Child('ElseKeyword', kind='ElseToken',
-                   is_optional=True),
-             Child('ElseBody', kind='Syntax', name_for_diagnostics='else body',
-                   node_choices=[
-                       Child('IfStmt', kind='IfStmt'),
-                       Child('CodeBlock', kind='CodeBlock'),
-                   ],
-                   is_optional=True),
-         ]),
-
     # switch-case -> unknown-attr? switch-case-label stmt-list
     #              | unknown-attr? switch-default-label stmt-list
     Node('SwitchCase', name_for_diagnostics='switch case', kind='Syntax',