Skip to content

Simplify castling in movegen #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codedeliveryservice merged 3 commits into from
May 24, 2026
Merged

Simplify castling in movegen #1041

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cc2426
simplify castling.
protonspring May 24, 2026
48ae662
Merge branch 'main' into ps_movegen126
protonspring May 24, 2026
267311a
Formatting.
protonspring May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/board/movegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,22 +92,20 @@ impl super::Board {

fn collect_castling(&self, list: &mut MoveList) {
let stm = self.side_to_move();
self.collect_castling_kind(list, CastlingKind::KINDS[stm][0]); //queenside
self.collect_castling_kind(list, CastlingKind::KINDS[stm][1]); //kingside
}

fn collect_castling_kind(&self, list: &mut MoveList, kind: CastlingKind) {
let stm = self.side_to_move();
if self.castling().is_allowed(kind)
&& (self.castling_path[kind] & self.occupancies()).is_empty()
&& (self.castling_threat[kind] & self.all_threats()).is_empty()
&& !self.pinned(stm).contains(self.castling_rooks[kind])
{
list.push(self.king_square(stm), kind.landing_square(), MoveKind::Castling);
for kind in [CastlingKind::KINDS[stm][0], CastlingKind::KINDS[stm][1]] {
if self.castling().is_allowed(kind)
&& (self.castling_path[kind] & self.occupancies()).is_empty()
&& (self.castling_threat[kind] & self.all_threats()).is_empty()
&& !self.pinned(stm).contains(self.castling_rooks[kind])
{
list.push(self.king_square(stm), kind.landing_square(), MoveKind::Castling);
}
}
}

fn collect_pawn_captures(&self, list: &mut MoveList, pawns: Bitboard, dir: i8, target: Bitboard, seventh_rank: Bitboard) {
fn collect_pawn_captures(
&self, list: &mut MoveList, pawns: Bitboard, dir: i8, target: Bitboard, seventh_rank: Bitboard,
) {
let promos = (pawns & seventh_rank).shift(dir);
list.push_promotion_capture_setwise(dir, promos & target);
let captures = (pawns & !seventh_rank).shift(dir);
Expand Down
Loading