Use inline move function for early returns

chess/board.go

@@ -312,10 +312,12 @@ func (b *Board) Move(move string) error {
 	// TODO: make sure king is not in check after move
 	//   ( this avoids moving into check and moving a piece that exposes the king to check e.g. pinned pieces )
 
+	move_ := func() error {
 		if len(move) == 2 {
-		err = b.movePawn(move, captureFrom)
-	} else if len(move) == 3 {
+			return b.movePawn(move, captureFrom)
+		}
 
+		if len(move) == 3 {
 			piece = move[0:1]
 			targetPosition = move[1:3]
 
@@ -328,23 +330,24 @@ func (b *Board) Move(move string) error {
 
 			switch strings.ToLower(piece) {
 			case "r":
-			err = b.moveRook(targetPosition, false)
+				return b.moveRook(targetPosition, false)
 			case "b":
-			err = b.moveBishop(targetPosition, false)
+				return b.moveBishop(targetPosition, false)
 			case "n":
-			err = b.moveKnight(targetPosition)
+				return b.moveKnight(targetPosition)
 			case "q":
-			err = b.moveQueen(targetPosition)
+				return b.moveQueen(targetPosition)
 			case "k":
-			err = b.moveKing(targetPosition)
+				return b.moveKing(targetPosition)
 			default:
-			err = fmt.Errorf("invalid move %s: %v", move, err)
+				return fmt.Errorf("invalid move %s: %v", move, err)
 			}
-	} else {
+		}
+
 		return fmt.Errorf("invalid move %s: %v", move, err)
 	}
 
-	if err != nil {
+	if err = move_(); err != nil {
 		return err
 	}