Assert enhancements in search

[stockfish] / src / movegen.h

diff --git a/src/movegen.h b/src/movegen.h
index 580ca2e74645cfd183b6457ec0c1a6fe594fd5d0..38351e32f70c1b29eaf2df30acb5e197a2df980a 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -20,8 +20,7 @@
 #if !defined(MOVEGEN_H_INCLUDED)
 #define MOVEGEN_H_INCLUDED
 
-#include "move.h"
-#include "position.h"
+#include "types.h"
 
 enum MoveType {
   MV_CAPTURE,
@@ -33,7 +32,25 @@ enum MoveType {
   MV_LEGAL
 };
 
+class Position;
+
 template<MoveType>
 MoveStack* generate(const Position& pos, MoveStack* mlist);
 
+/// The MoveList struct is a simple wrapper around generate(), sometimes comes
+/// handy to use this class instead of the low level generate() function.
+template<MoveType T>
+struct MoveList {
+
+  explicit MoveList(const Position& pos) : cur(mlist), last(generate<T>(pos, mlist)) {}
+  void operator++() { cur++; }
+  bool end() const { return cur == last; }
+  Move move() const { return cur->move; }
+  int size() const { return int(last - mlist); }
+
+private:
+  MoveStack mlist[MAX_MOVES];
+  MoveStack *cur, *last;
+};
+
 #endif // !defined(MOVEGEN_H_INCLUDED)