[board] Rename the moves modules → move_generator
Update the imports. Also update some references to crate symbols in move_generator macros to use $crate.
This commit is contained in:
parent
2d4ad70994
commit
ca9ff94d2a
11 changed files with 10 additions and 11 deletions
|
@ -3,8 +3,8 @@
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
mod bitboard;
|
mod bitboard;
|
||||||
mod display;
|
mod display;
|
||||||
mod moves;
|
|
||||||
mod r#move;
|
mod r#move;
|
||||||
|
mod move_generator;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
pub mod piece;
|
pub mod piece;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
|
|
|
@ -15,7 +15,7 @@ pub(self) use move_set::MoveSet;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
piece::{Color, Piece, PlacedPiece},
|
piece::{Color, Piece, PlacedPiece},
|
||||||
BitBoard, Position, Square,
|
Move, Position, Square,
|
||||||
};
|
};
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
@ -33,14 +33,14 @@ macro_rules! move_generator_declaration {
|
||||||
};
|
};
|
||||||
($name:ident, struct) => {
|
($name:ident, struct) => {
|
||||||
pub(super) struct $name<'pos> {
|
pub(super) struct $name<'pos> {
|
||||||
position: &'pos crate::Position,
|
position: &'pos $crate::Position,
|
||||||
color: crate::piece::Color,
|
color: $crate::piece::Color,
|
||||||
move_sets: std::collections::BTreeMap<crate::Square, crate::moves::MoveSet>,
|
move_sets: std::collections::BTreeMap<$crate::Square, $crate::move_generator::MoveSet>,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
($name:ident, new) => {
|
($name:ident, new) => {
|
||||||
impl<'pos> $name<'pos> {
|
impl<'pos> $name<'pos> {
|
||||||
pub(super) fn new(position: &Position, color: $crate::piece::Color) -> $name {
|
pub(super) fn new(position: &$crate::Position, color: $crate::piece::Color) -> $name {
|
||||||
$name {
|
$name {
|
||||||
position,
|
position,
|
||||||
color,
|
color,
|
||||||
|
@ -51,7 +51,7 @@ macro_rules! move_generator_declaration {
|
||||||
};
|
};
|
||||||
($name:ident, getters) => {
|
($name:ident, getters) => {
|
||||||
impl<'pos> $name<'pos> {
|
impl<'pos> $name<'pos> {
|
||||||
pub(super) fn iter(&self) -> impl Iterator<Item = &crate::Move> + '_ {
|
pub(super) fn iter(&self) -> impl Iterator<Item = &$crate::Move> + '_ {
|
||||||
self.move_sets.values().map(|set| set.moves()).flatten()
|
self.move_sets.values().map(|set| set.moves()).flatten()
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,10 +4,9 @@ use super::{
|
||||||
bishop::ClassicalMoveGenerator as BishopMoveGenerator, king::KingMoveGenerator,
|
bishop::ClassicalMoveGenerator as BishopMoveGenerator, king::KingMoveGenerator,
|
||||||
knight::KnightMoveGenerator, pawn::PawnMoveGenerator,
|
knight::KnightMoveGenerator, pawn::PawnMoveGenerator,
|
||||||
queen::ClassicalMoveGenerator as QueenMoveGenerator,
|
queen::ClassicalMoveGenerator as QueenMoveGenerator,
|
||||||
rook::ClassicalMoveGenerator as RookMoveGenerator, Move,
|
rook::ClassicalMoveGenerator as RookMoveGenerator,
|
||||||
};
|
};
|
||||||
use crate::piece::Color;
|
use crate::{piece::Color, Move, Position};
|
||||||
use crate::Position;
|
|
||||||
|
|
||||||
pub struct Moves<'pos> {
|
pub struct Moves<'pos> {
|
||||||
pawn_moves: PawnMoveGenerator<'pos>,
|
pawn_moves: PawnMoveGenerator<'pos>,
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
use super::{flags::Flags, Pieces};
|
use super::{flags::Flags, Pieces};
|
||||||
use crate::{
|
use crate::{
|
||||||
moves::Moves,
|
move_generator::Moves,
|
||||||
piece::{Color, Piece, PiecePlacementError, PlacedPiece, Shape},
|
piece::{Color, Piece, PiecePlacementError, PlacedPiece, Shape},
|
||||||
sight::Sight,
|
sight::Sight,
|
||||||
BitBoard, Square,
|
BitBoard, Square,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue