pavel/chess
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Purge ALL_VALUES from rank/file enums

Browse Source
This commit is contained in:
Pavel Lutskov
2025-02-20 21:07:55 +01:00
parent 01ccb65b64
commit 797c54e83b
1 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rs/src/board.rs
View File

@@ -87,7 +87,6 @@ where
Self: Sized, Self: Sized,
Self: Clone, Self: Clone,
{ {
const ALL_VALUES: [Self; 8];
fn incr(&self) -> Option<Self>; fn incr(&self) -> Option<Self>;
fn decr(&self) -> Option<Self>; fn decr(&self) -> Option<Self>;
fn delta(&self, direction: &Direction) -> Option<Self> { fn delta(&self, direction: &Direction) -> Option<Self> {
@@ -100,16 +99,6 @@ where
} }
impl GridAxis for Rank { impl GridAxis for Rank {
const ALL_VALUES: [Rank; 8] = [
Rank::_1,
Rank::_2,
Rank::_3,
Rank::_4,
Rank::_5,
Rank::_6,
Rank::_7,
Rank::_8,
];
fn incr(&self) -> Option<Self> { fn incr(&self) -> Option<Self> {
match self { match self {
Rank::_1 => Some(Rank::_2), Rank::_1 => Some(Rank::_2),
@@ -137,16 +126,6 @@ impl GridAxis for Rank {
} }
impl GridAxis for File { impl GridAxis for File {
const ALL_VALUES: [File; 8] = [
File::A,
File::B,
File::C,
File::D,
File::E,
File::F,
File::G,
File::H,
];
fn incr(&self) -> Option<Self> { fn incr(&self) -> Option<Self> {
match self { match self {
File::A => Some(File::B), File::A => Some(File::B),
@@ -180,21 +159,35 @@ pub enum PieceType {
impl PieceType { impl PieceType {
fn initial_setup(&self) -> Vec<(Piece, Position)> { fn initial_setup(&self) -> Vec<(Piece, Position)> {
fn pawn(color: Color, file: File) -> (Piece, Position) {
let pos = Position::new(file, color.get_pawn_rank());
(
Piece {
piece_type: PieceType::Pawn,
color,
},
pos,
)
}
match &self { match &self {
PieceType::Pawn => [Color::Black, Color::White] PieceType::Pawn => vec![
.iter() pawn(Color::White, File::A),
.flat_map(|color| { pawn(Color::White, File::B),
File::ALL_VALUES.iter().map(|&file| { pawn(Color::White, File::C),
( pawn(Color::White, File::D),
Piece { pawn(Color::White, File::E),
piece_type: self.clone(), pawn(Color::White, File::F),
color: color.clone(), pawn(Color::White, File::G),
}, pawn(Color::White, File::H),
Position::new(file, color.get_pawn_rank()), pawn(Color::Black, File::A),
) pawn(Color::Black, File::B),
}) pawn(Color::Black, File::C),
}) pawn(Color::Black, File::D),
.collect(), pawn(Color::Black, File::E),
pawn(Color::Black, File::F),
pawn(Color::Black, File::G),
pawn(Color::Black, File::H),
],
} }
} }
} }