X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.h;h=84d5d35ef70b07789f98e4149de0cf4ae3f95e41;hp=6a04248ac3a3199c80f087aaf3a180ff5bc7ad4f;hb=55df3fa2d7631ed67e46f9433aa7f3a71c18e5e7;hpb=5ba85ef441fb12738732824092f74aa49149fcf9

diff --git a/src/movegen.h b/src/movegen.h
index 6a04248a..84d5d35e 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,21 +20,36 @@
 #if !defined(MOVEGEN_H_INCLUDED)
 #define MOVEGEN_H_INCLUDED
 
-#include "move.h"
-#include "position.h"
-
-enum MoveType {
-  MV_CAPTURE,
-  MV_NON_CAPTURE,
-  MV_CHECK,
-  MV_NON_CAPTURE_CHECK,
-  MV_EVASION,
-  MV_NON_EVASION,
-  MV_LEGAL,
-  MV_PSEUDO_LEGAL
+#include "types.h"
+
+enum GenType {
+  CAPTURES,
+  QUIETS,
+  QUIET_CHECKS,
+  EVASIONS,
+  NON_EVASIONS,
+  LEGAL
 };
 
-template<MoveType>
+class Position;
+
+template<GenType>
 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<GenType 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; }
+  size_t size() const { return last - mlist; }
+
+private:
+  MoveStack mlist[MAX_MOVES];
+  MoveStack *cur, *last;
+};
+
 #endif // !defined(MOVEGEN_H_INCLUDED)