eryn/chessfriend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[position] Factor out the update_moves_with_ray! as ray_in_direction!

Browse source 
This macro is implemented in every sight method. Factor it out, rename it, and
use it in all these macros.
This commit is contained in:
Eryn Wells 2024-02-01 08:43:03 -08:00
parent 722a90b860
commit f1a05f33c9
1 changed files with 30 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

91
position/src/sight.rs
View file

@ -4,6 +4,20 @@ use crate::position::piece_sets::PieceBitBoards;
use chessfriend_bitboard::BitBoard; use chessfriend_bitboard::BitBoard;
use chessfriend_core::{Color, Direction, PlacedPiece, Shape, Square}; use chessfriend_core::{Color, Direction, PlacedPiece, Shape, Square};
macro_rules! ray_in_direction {
($square:expr, $blockers:expr, $direction:ident, $occupied_squares:tt) => {{
let ray = BitBoard::ray($square, Direction::$direction);
if let Some(first_occupied_square) = BitBoard::$occupied_squares(&(ray & $blockers)).next()
{
let remainder = BitBoard::ray(first_occupied_square, Direction::$direction);
let attack_ray = ray & !remainder;
attack_ray
} else {
*ray
}
}};
}
pub(crate) trait SightExt { pub(crate) trait SightExt {
fn sight(&self, pieces: &PieceBitBoards, en_passant_square: Option<Square>) -> BitBoard; fn sight(&self, pieces: &PieceBitBoards, en_passant_square: Option<Square>) -> BitBoard;
@ -92,25 +106,10 @@ impl SightExt for PlacedPiece {
let blockers = pieces.all_pieces(); let blockers = pieces.all_pieces();
macro_rules! update_moves_with_ray { sight |= ray_in_direction!(square, blockers, NorthEast, occupied_squares_trailing);
($direction:ident, $occupied_squares:tt) => { sight |= ray_in_direction!(square, blockers, NorthWest, occupied_squares_trailing);
let ray = BitBoard::ray(square, Direction::$direction); sight |= ray_in_direction!(square, blockers, SouthEast, occupied_squares);
if let Some(first_occupied_square) = sight |= ray_in_direction!(square, blockers, SouthWest, occupied_squares);
BitBoard::$occupied_squares(&(ray & blockers)).next()
{
let remainder = BitBoard::ray(first_occupied_square, Direction::$direction);
let attack_ray = ray & !remainder;
sight |= attack_ray;
} else {
sight |= ray;
}
};
}
update_moves_with_ray!(NorthEast, occupied_squares_trailing);
update_moves_with_ray!(NorthWest, occupied_squares_trailing);
update_moves_with_ray!(SouthEast, occupied_squares);
update_moves_with_ray!(SouthWest, occupied_squares);
let friendly_pieces = pieces.all_pieces_of_color(self.color()); let friendly_pieces = pieces.all_pieces_of_color(self.color());
sight & !friendly_pieces sight & !friendly_pieces
@ -123,25 +122,10 @@ impl SightExt for PlacedPiece {
let blockers = pieces.all_pieces(); let blockers = pieces.all_pieces();
macro_rules! update_moves_with_ray { sight |= ray_in_direction!(square, blockers, North, occupied_squares_trailing);
($direction:ident, $occupied_squares:tt) => { sight |= ray_in_direction!(square, blockers, East, occupied_squares_trailing);
let ray = BitBoard::ray(square, Direction::$direction); sight |= ray_in_direction!(square, blockers, South, occupied_squares);
if let Some(first_occupied_square) = sight |= ray_in_direction!(square, blockers, West, occupied_squares);
BitBoard::$occupied_squares(&(ray & blockers)).next()
{
let remainder = BitBoard::ray(first_occupied_square, Direction::$direction);
let attack_ray = ray & !remainder;
sight |= attack_ray;
} else {
sight |= ray;
}
};
}
update_moves_with_ray!(North, occupied_squares_trailing);
update_moves_with_ray!(East, occupied_squares_trailing);
update_moves_with_ray!(South, occupied_squares);
update_moves_with_ray!(West, occupied_squares);
let friendly_pieces = pieces.all_pieces_of_color(self.color()); let friendly_pieces = pieces.all_pieces_of_color(self.color());
sight & !friendly_pieces sight & !friendly_pieces
@ -154,29 +138,14 @@ impl SightExt for PlacedPiece {
let blockers = pieces.all_pieces(); let blockers = pieces.all_pieces();
macro_rules! update_moves_with_ray { sight |= ray_in_direction!(square, blockers, NorthWest, occupied_squares_trailing);
($direction:ident, $occupied_squares:tt) => { sight |= ray_in_direction!(square, blockers, North, occupied_squares_trailing);
let ray = BitBoard::ray(square, Direction::$direction); sight |= ray_in_direction!(square, blockers, NorthEast, occupied_squares_trailing);
if let Some(first_occupied_square) = sight |= ray_in_direction!(square, blockers, East, occupied_squares_trailing);
BitBoard::$occupied_squares(&(ray & blockers)).next() sight |= ray_in_direction!(square, blockers, SouthEast, occupied_squares);
{ sight |= ray_in_direction!(square, blockers, South, occupied_squares);
let remainder = BitBoard::ray(first_occupied_square, Direction::$direction); sight |= ray_in_direction!(square, blockers, SouthWest, occupied_squares);
let attack_ray = ray & !remainder; sight |= ray_in_direction!(square, blockers, West, occupied_squares);
sight |= attack_ray;
} else {
sight |= ray;
}
};
}
update_moves_with_ray!(NorthWest, occupied_squares_trailing);
update_moves_with_ray!(North, occupied_squares_trailing);
update_moves_with_ray!(NorthEast, occupied_squares_trailing);
update_moves_with_ray!(East, occupied_squares_trailing);
update_moves_with_ray!(SouthEast, occupied_squares);
update_moves_with_ray!(South, occupied_squares);
update_moves_with_ray!(SouthWest, occupied_squares);
update_moves_with_ray!(West, occupied_squares);
let friendly_pieces = pieces.all_pieces_of_color(self.color()); let friendly_pieces = pieces.all_pieces_of_color(self.color());
sight & !friendly_pieces sight & !friendly_pieces