X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.h;h=a80db334cbef6e9c1ba4e92e802588168ee4601b;hp=636e439dc841f30604dbcc786c4c231afa702260;hb=ad1f28bc1c1c5426fb8ab246f5d43ad57002b4d5;hpb=12f4bbc8f2b6122d9dc0949f3483e7dd3f26a829

diff --git a/src/movegen.h b/src/movegen.h
index 636e439d..a80db334 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -17,27 +17,38 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MOVEGEN_H_INCLUDED)
 #define MOVEGEN_H_INCLUDED
 
-#include "position.h"
+#include "move.h"
 
-enum MoveGeneration {
-  CAPTURES,
-  NON_CAPTURES,
-  NON_CAPTURE_CHECKS,
-  EVASIONS,
-  NON_EVASIONS,
-  ALL_MOVES
+enum MoveType {
+  MV_CAPTURE,
+  MV_NON_CAPTURE,
+  MV_CHECK,
+  MV_NON_CAPTURE_CHECK,
+  MV_EVASION,
+  MV_NON_EVASION,
+  MV_LEGAL
 };
 
-template<MoveGeneration T>
+template<MoveType>
 MoveStack* generate(const Position& pos, MoveStack* mlist);
 
-extern MoveStack* generate_moves(const Position& pos, MoveStack* mlist, bool pseudoLegal = false);
-extern bool move_is_legal(const Position& pos, const Move m, Bitboard pinned);
-extern bool move_is_legal(const Position& pos, const Move m);
+/// 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)