[board] Export BitBoard directly off of the crate for internal use

Update all the imports to import from the crate directly.
This commit is contained in:
Eryn Wells 2024-01-14 10:57:22 -08:00
parent ddea2c2d63
commit 5961b1bcd5
12 changed files with 20 additions and 29 deletions

View file

@ -3,5 +3,5 @@ mod bitboard;
mod library; mod library;
mod shifts; mod shifts;
pub(crate) use self::bit_scanner::{LeadingBitScanner, TrailingBitScanner}; pub(crate) use bit_scanner::{LeadingBitScanner, TrailingBitScanner};
pub(crate) use self::bitboard::BitBoard; pub(crate) use bitboard::BitBoard;

View file

@ -12,3 +12,5 @@ mod square;
pub use moves::Move; pub use moves::Move;
pub use position::Position; pub use position::Position;
pub use square::{File, Rank, Square}; pub use square::{File, Rank, Square};
pub(crate) use bitboard::BitBoard;

View file

@ -2,10 +2,9 @@
use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet}; use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet};
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
square::Direction, square::Direction,
Move, Position, BitBoard, Move, Position,
}; };
move_generator_declaration!(ClassicalMoveGenerator); move_generator_declaration!(ClassicalMoveGenerator);
@ -64,10 +63,9 @@ impl<'pos> MoveGeneratorInternal for ClassicalMoveGenerator<'pos> {
mod tests { mod tests {
use super::*; use super::*;
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece}, piece::{Color, Piece},
position::DiagramFormatter, position::DiagramFormatter,
Position, Square, BitBoard, Position, Square,
}; };
#[test] #[test]

View file

@ -5,10 +5,9 @@
use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet}; use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet};
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
position::BoardSide, position::BoardSide,
Move, Position, BitBoard, Move, Position,
}; };
move_generator_declaration!(KingMoveGenerator, struct); move_generator_declaration!(KingMoveGenerator, struct);

View file

@ -2,9 +2,8 @@
use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet}; use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet};
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
Move, Position, BitBoard, Move, Position,
}; };
move_generator_declaration!(KnightMoveGenerator); move_generator_declaration!(KnightMoveGenerator);

View file

@ -16,9 +16,8 @@ pub use r#move::Move;
pub(self) use move_set::MoveSet; pub(self) use move_set::MoveSet;
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
Position, Square, BitBoard, Position, Square,
}; };
use std::collections::BTreeMap; use std::collections::BTreeMap;
@ -43,7 +42,7 @@ macro_rules! move_generator_declaration {
}; };
($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: &Position, color: $crate::piece::Color) -> $name {
$name { $name {
position, position,
color, color,
@ -58,10 +57,10 @@ macro_rules! move_generator_declaration {
self.move_sets.values().map(|set| set.moves()).flatten() self.move_sets.values().map(|set| set.moves()).flatten()
} }
fn bitboard(&self) -> crate::bitboard::BitBoard { fn bitboard(&self) -> $crate::BitBoard {
self.move_sets self.move_sets
.values() .values()
.fold(crate::bitboard::BitBoard::empty(), |partial, mv_set| { .fold($crate::BitBoard::empty(), |partial, mv_set| {
partial | mv_set.bitboard() partial | mv_set.bitboard()
}) })
} }

View file

@ -1,4 +1,4 @@
use crate::{bitboard::BitBoard, piece::PlacedPiece, Move}; use crate::{piece::PlacedPiece, BitBoard, Move};
struct BitBoardSet { struct BitBoardSet {
quiet: BitBoard, quiet: BitBoard,

View file

@ -1,9 +1,8 @@
// Eryn Wells <eryn@erynwells.me> // Eryn Wells <eryn@erynwells.me>
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, Shape}, piece::{Color, Piece, Shape},
Move, Position, BitBoard, Move, Position,
}; };
enum MoveList { enum MoveList {

View file

@ -2,10 +2,9 @@
use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet}; use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet};
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
square::Direction, square::Direction,
Move, Position, BitBoard, Move, Position,
}; };
move_generator_declaration!(ClassicalMoveGenerator); move_generator_declaration!(ClassicalMoveGenerator);
@ -68,10 +67,9 @@ impl<'pos> MoveGeneratorInternal for ClassicalMoveGenerator<'pos> {
mod tests { mod tests {
use super::*; use super::*;
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece}, piece::{Color, Piece},
position::DiagramFormatter, position::DiagramFormatter,
Position, Square, BitBoard, Position, Square,
}; };
#[test] #[test]

View file

@ -2,10 +2,9 @@
use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet}; use super::{move_generator_declaration, MoveGeneratorInternal, MoveSet};
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece, PlacedPiece}, piece::{Color, Piece, PlacedPiece},
square::Direction, square::Direction,
Move, Position, BitBoard, Move, Position,
}; };
move_generator_declaration!(ClassicalMoveGenerator); move_generator_declaration!(ClassicalMoveGenerator);
@ -64,10 +63,9 @@ impl<'pos> MoveGeneratorInternal for ClassicalMoveGenerator<'pos> {
mod tests { mod tests {
use super::*; use super::*;
use crate::{ use crate::{
bitboard::BitBoard,
piece::{Color, Piece}, piece::{Color, Piece},
position::DiagramFormatter, position::DiagramFormatter,
Position, Square, BitBoard, Position, Square,
}; };
#[test] #[test]

View file

@ -1,8 +1,8 @@
// Eryn Wells <eryn@erynwells.me> // Eryn Wells <eryn@erynwells.me>
use super::Position; use super::Position;
use crate::bitboard::BitBoard;
use crate::piece::{Color, Piece, PlacedPiece, Shape}; use crate::piece::{Color, Piece, PlacedPiece, Shape};
use crate::BitBoard;
use crate::Square; use crate::Square;
pub struct Pieces<'a> { pub struct Pieces<'a> {

View file

@ -2,10 +2,9 @@
use super::{flags::Flags, Pieces}; use super::{flags::Flags, Pieces};
use crate::{ use crate::{
bitboard::BitBoard,
moves::Moves, moves::Moves,
piece::{Color, Piece, PiecePlacementError, PlacedPiece, Shape}, piece::{Color, Piece, PiecePlacementError, PlacedPiece, Shape},
Square, BitBoard, Square,
}; };
use std::fmt; use std::fmt;
use std::fmt::Write; use std::fmt::Write;