stefiosif/zeal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement Index traits for Kind

Browse Source
This commit is contained in:
stefiosif
2024-07-16 21:52:14 +03:00
parent a1db302d0d
commit 1c80db695f
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/board.rs
View File

@@ -84,24 +84,21 @@ impl Board {
}; };
have_common_bit( have_common_bit(
opponent[Kind::Pawn.idx()].bitboard, opponent[Kind::Pawn].bitboard,
fetch_pawn_attacks(square, own_color), fetch_pawn_attacks(square, own_color),
) || have_common_bit( ) || have_common_bit(
opponent[Kind::Knight.idx()].bitboard, opponent[Kind::Knight].bitboard,
fetch_knight_attacks(square), fetch_knight_attacks(square),
) || have_common_bit( ) || have_common_bit(
opponent[Kind::Bishop.idx()].bitboard, opponent[Kind::Bishop].bitboard,
fetch_bishop_attacks(all_occupancies, square), fetch_bishop_attacks(all_occupancies, square),
) || have_common_bit( ) || have_common_bit(
opponent[Kind::Rook.idx()].bitboard, opponent[Kind::Rook].bitboard,
fetch_rook_attacks(all_occupancies, square), fetch_rook_attacks(all_occupancies, square),
) || have_common_bit( ) || have_common_bit(
opponent[Kind::Queen.idx()].bitboard, opponent[Kind::Queen].bitboard,
fetch_queen_attacks(all_occupancies, square), fetch_queen_attacks(all_occupancies, square),
) || have_common_bit( ) || have_common_bit(opponent[Kind::King].bitboard, fetch_king_attacks(square))
opponent[Kind::King.idx()].bitboard,
fetch_king_attacks(square),
)
} }
pub fn is_move_legit(&self, square: usize, opponent_color: Color) -> bool { pub fn is_move_legit(&self, square: usize, opponent_color: Color) -> bool {
@@ -123,12 +120,12 @@ impl Board {
let all_occupancies = self.all_occupancies(); let all_occupancies = self.all_occupancies();
let (pieces, opponent_occupancies, own_occupancies) = match color { let (pieces, opponent_occupancies, own_occupancies) = match color {
Color::White => ( Color::White => (
self.white_pieces[kind.idx()].bitboard, self.white_pieces[kind].bitboard,
self.black_occupancies(), self.black_occupancies(),
self.white_occupancies(), self.white_occupancies(),
), ),
Color::Black => ( Color::Black => (
self.black_pieces[kind.idx()].bitboard, self.black_pieces[kind].bitboard,
self.white_occupancies(), self.white_occupancies(),
self.black_occupancies(), self.black_occupancies(),
), ),
@@ -152,8 +149,8 @@ impl Board {
pub fn set_piece(&mut self, piece: Piece) { pub fn set_piece(&mut self, piece: Piece) {
match piece.color { match piece.color {
Color::Black => self.black_pieces[piece.kind.idx()].bitboard |= piece.bitboard, Color::Black => self.black_pieces[piece.kind].bitboard |= piece.bitboard,
Color::White => self.white_pieces[piece.kind.idx()].bitboard |= piece.bitboard, Color::White => self.white_pieces[piece.kind].bitboard |= piece.bitboard,
}; };
} }
@@ -196,8 +193,30 @@ pub enum Kind {
} }
impl Kind { impl Kind {
pub const fn idx(&self) -> usize { fn idx(&self) -> usize {
*self as usize match self {
Kind::Pawn => 0,
Kind::Knight => 1,
Kind::Bishop => 2,
Kind::Rook => 3,
Kind::Queen => 4,
Kind::King => 5,
}
}
}
use std::ops::{Index, IndexMut};
impl Index<Kind> for [Piece] {
type Output = Piece;
fn index(&self, kind: Kind) -> &Self::Output {
&self[kind.idx()]
}
}
impl IndexMut<Kind> for [Piece] {
fn index_mut(&mut self, kind: Kind) -> &mut Self::Output {
&mut self[kind.idx()]
} }
} }

10
src/move.rs
View File

@@ -63,7 +63,7 @@ impl Board {
.update_castling_state_capture(mv.dst, Color::opponent_color(color)); .update_castling_state_capture(mv.dst, Color::opponent_color(color));
self.state.change_side(); self.state.change_side();
let own_king_square = lsb(pieces[Kind::King.idx()].bitboard); let own_king_square = lsb(pieces[Kind::King].bitboard);
self.is_move_legit(own_king_square, Color::opponent_color(color)) self.is_move_legit(own_king_square, Color::opponent_color(color))
} }
@@ -138,10 +138,10 @@ impl Board {
fn promote_piece(square: usize, pieces: &mut [Piece; 6], promote: Promote) { fn promote_piece(square: usize, pieces: &mut [Piece; 6], promote: Promote) {
match promote { match promote {
Promote::Knight => pieces[Kind::Knight.idx()].bitboard |= square_to_bitboard(square), Promote::Knight => pieces[Kind::Knight].bitboard |= square_to_bitboard(square),
Promote::Bishop => pieces[Kind::Bishop.idx()].bitboard |= square_to_bitboard(square), Promote::Bishop => pieces[Kind::Bishop].bitboard |= square_to_bitboard(square),
Promote::Rook => pieces[Kind::Rook.idx()].bitboard |= square_to_bitboard(square), Promote::Rook => pieces[Kind::Rook].bitboard |= square_to_bitboard(square),
Promote::Queen => pieces[Kind::Queen.idx()].bitboard |= square_to_bitboard(square), Promote::Queen => pieces[Kind::Queen].bitboard |= square_to_bitboard(square),
}; };
} }