NFC: Move parseIfStatement into Expressions.swift

Author: hamishknight

Sources/SwiftParser/Expressions.swift

@@ -2099,6 +2099,47 @@ extension Parser.Lookahead {
   }
 }
 
+extension Parser {
+  /// Parse an if statement.
+  ///
+  /// Grammar
+  /// =======
+  ///
+  ///     if-statement → 'if' condition-list code-block else-clause?
+  ///     else-clause  → 'else' code-block | else if-statement
+  @_spi(RawSyntax)
+  public mutating func parseIfStatement(ifHandle: RecoveryConsumptionHandle) -> RawIfStmtSyntax {
+    let (unexpectedBeforeIfKeyword, ifKeyword) = self.eat(ifHandle)
+    // A scope encloses the condition and true branch for any variables bound
+    // by a conditional binding. The else branch does *not* see these variables.
+    let conditions = self.parseConditionList()
+    let body = self.parseCodeBlock(introducer: ifKeyword)
+
+    // The else branch, if any, is outside of the scope of the condition.
+    let elseKeyword = self.consume(if: .keyword(.else))
+    let elseBody: RawIfStmtSyntax.ElseBody?
+    if elseKeyword != nil {
+      if self.at(.keyword(.if)) {
+        elseBody = .ifStmt(self.parseIfStatement(ifHandle: .constant(.keyword(.if))))
+      } else {
+        elseBody = .codeBlock(self.parseCodeBlock(introducer: ifKeyword))
+      }
+    } else {
+      elseBody = nil
+    }
+
+    return RawIfStmtSyntax(
+      unexpectedBeforeIfKeyword,
+      ifKeyword: ifKeyword,
+      conditions: conditions,
+      body: body,
+      elseKeyword: elseKeyword,
+      elseBody: elseBody,
+      arena: self.arena
+    )
+  }
+}
+
 // MARK: Lookahead
 
 extension Parser.Lookahead {

Sources/SwiftParser/Statements.swift

@@ -132,47 +132,6 @@ extension Parser {
 
 // MARK: Conditional Statements
 
-extension Parser {
-  /// Parse an if statement.
-  ///
-  /// Grammar
-  /// =======
-  ///
-  ///     if-statement → 'if' condition-list code-block else-clause?
-  ///     else-clause  → 'else' code-block | else if-statement
-  @_spi(RawSyntax)
-  public mutating func parseIfStatement(ifHandle: RecoveryConsumptionHandle) -> RawIfStmtSyntax {
-    let (unexpectedBeforeIfKeyword, ifKeyword) = self.eat(ifHandle)
-    // A scope encloses the condition and true branch for any variables bound
-    // by a conditional binding. The else branch does *not* see these variables.
-    let conditions = self.parseConditionList()
-    let body = self.parseCodeBlock(introducer: ifKeyword)
-
-    // The else branch, if any, is outside of the scope of the condition.
-    let elseKeyword = self.consume(if: .keyword(.else))
-    let elseBody: RawIfStmtSyntax.ElseBody?
-    if elseKeyword != nil {
-      if self.at(.keyword(.if)) {
-        elseBody = .ifStmt(self.parseIfStatement(ifHandle: .constant(.keyword(.if))))
-      } else {
-        elseBody = .codeBlock(self.parseCodeBlock(introducer: ifKeyword))
-      }
-    } else {
-      elseBody = nil
-    }
-
-    return RawIfStmtSyntax(
-      unexpectedBeforeIfKeyword,
-      ifKeyword: ifKeyword,
-      conditions: conditions,
-      body: body,
-      elseKeyword: elseKeyword,
-      elseBody: elseBody,
-      arena: self.arena
-    )
-  }
-}
-
 extension Parser {
   /// Parse a guard statement.
   ///