Skip to content

Commit

Permalink
rename javaPiece helper to chessPiece and so on
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasf authored and ornicar committed Jan 26, 2018
1 parent ad451ed commit c47f6a9
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modules/game/src/main/PgnStorage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ object PgnStorage {
}
def decode(bytes: ByteArray, plies: Int): Decoded = monitor(lila.mon.game.pgn.huffman.decode) {
val decoded = Encoder.decode(bytes.value, plies)
val unmovedRooks = asScalaSet(decoded.unmovedRooks.flatMap(javaPos)).toSet
val unmovedRooks = asScalaSet(decoded.unmovedRooks.flatMap(chessPos)).toSet
Decoded(
pgnMoves = decoded.pgnMoves.toVector,
pieces = mapAsScalaMap(decoded.pieces).flatMap {
case (k, v) => javaPos(k).map(_ -> javaPiece(v))
case (k, v) => chessPos(k).map(_ -> chessPiece(v))
}.toMap,
positionHashes = decoded.positionHashes,
unmovedRooks = UnmovedRooks(unmovedRooks),
Expand All @@ -53,16 +53,16 @@ object PgnStorage {
)
}

private def javaPos(sq: Integer): Option[Pos] = Pos.posAt(JavaSquare.file(sq) + 1, JavaSquare.rank(sq) + 1)
private def javaRole(role: JavaRole): Role = role match {
private def chessPos(sq: Integer): Option[Pos] = Pos.posAt(JavaSquare.file(sq) + 1, JavaSquare.rank(sq) + 1)
private def chessRole(role: JavaRole): Role = role match {
case JavaRole.PAWN => Pawn
case JavaRole.KNIGHT => Knight
case JavaRole.BISHOP => Bishop
case JavaRole.ROOK => Rook
case JavaRole.QUEEN => Queen
case JavaRole.KING => King
}
private def javaPiece(piece: JavaPiece): Piece = Piece(Color(piece.white), javaRole(piece.role))
private def chessPiece(piece: JavaPiece): Piece = Piece(Color(piece.white), chessRole(piece.role))
}

case class Decoded(
Expand Down

0 comments on commit c47f6a9

Please sign in to comment.