Refactor iterators (#13)

* Do not serialize private game data

* Put movement logic in chusst-gen::game::play

* Allow to backup GameState mobility data

* Allow chaining iterators more ergonomically

* Fix iterators

* Fix take_while_empty_or_enemy()

* Fix take_while_empty_until_enemy()

chusst-gen/Cargo.toml

@@ -9,6 +9,8 @@ edition = "2021"
 anyhow = "1.0.79"
 atty = "0.2.14"
 colored = "2.1.0"
+lazy_static = "1.4.0"
+rand = "0.8.5"
 serde = { version = "1.0.195", features = ["derive"] }
 
 [dev-dependencies]

chusst-gen/src/board.rs

@@ -1,3 +1,5 @@
+mod iter;
+
 // Board representations
 #[cfg(feature = "bitboards")]
 mod bitboards;
@@ -13,6 +15,10 @@ pub(crate) use bitboards::PlayerBitboards;
 pub use compact::CompactBoard;
 pub use simple::SimpleBoard;
 
+pub use self::iter::{BoardIter, Direction, PositionIter, PositionIterator};
+
+use self::iter::{try_move, DirectionIter};
+
 use atty;
 use colored::Colorize;
 use serde::{ser::SerializeMap, ser::SerializeSeq, Serialize};
@@ -408,14 +414,43 @@ macro_rules! pos {
 pub type Files<T> = [T; 8];
 pub type Ranks<T> = [Files<T>; 8];
 
-pub trait ModifiableBoard<K, V> {
+pub trait ModifiableBoard<K, V>
+where
+    Self: Sized,
+{
     fn at(&self, pos: &K) -> V;
     fn update(&mut self, pos: &K, value: V);
     fn move_piece(&mut self, source: &K, target: &K);
 }
 
+pub trait IterableBoard
+where
+    Self: Sized,
+{
+    fn try_move(&self, position: &Position, direction: &Direction) -> PositionIter<Self> {
+        PositionIter::new(self, try_move(position, direction))
+    }
+
+    fn position_iter(&self, position: &Position) -> PositionIter<Self> {
+        PositionIter::new(self, Some(*position))
+    }
+
+    fn board_iter(&self) -> BoardIter<Self> {
+        BoardIter::new(self)
+    }
+
+    fn direction_iterator(
+        &self,
+        position: &Position,
+        direction: &Direction,
+    ) -> DirectionIter<Self> {
+        DirectionIter::new(self, Some(*position), *direction)
+    }
+}
+
 pub trait Board:
     ModifiableBoard<Position, Option<Piece>>
+    + IterableBoard
     + Clone
     + Default
     + fmt::Debug

chusst-gen/src/board/bitboards.rs

@@ -4,7 +4,8 @@ mod in_between;
 use serde::Serialize;
 
 use super::{
-    format_board, serialize_board, Board, ModifiableBoard, Piece, PieceType, Player, Position,
+    format_board, serialize_board, Board, IterableBoard, ModifiableBoard, Piece, PieceType, Player,
+    Position,
 };
 use std::fmt;
 
@@ -378,6 +379,8 @@ impl ModifiableBoard<Position, Option<Piece>> for Bitboards {
     }
 }
 
+impl IterableBoard for Bitboards {}
+
 impl Board for Bitboards {
     const NEW_BOARD: Self = Bitboards::new();
 }

chusst-gen/src/board/compact.rs

@@ -3,8 +3,8 @@ use std::fmt;
 use serde::Serialize;
 
 use super::{
-    format_board, serialize_board, Board, ModifiableBoard, Piece, PieceType, Player, Position,
-    Ranks,
+    format_board, serialize_board, Board, IterableBoard, ModifiableBoard, Piece, PieceType, Player,
+    Position, Ranks,
 };
 use crate::p;
 
@@ -128,6 +128,8 @@ impl ModifiableBoard<Position, Option<Piece>> for CompactBoard {
     }
 }
 
+impl IterableBoard for CompactBoard {}
+
 impl Board for CompactBoard {
     const NEW_BOARD: Self = CompactBoard::new();
 }