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

diff --git a/src/movegen.h b/src/movegen.h
index 636e439d..2721f152 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -1,7 +1,8 @@
 /*
   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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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
@@ -17,27 +18,53 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
 #define MOVEGEN_H_INCLUDED
 
-#include "position.h"
+#include "types.h"
+
+class Position;
 
-enum MoveGeneration {
+enum GenType {
   CAPTURES,
-  NON_CAPTURES,
-  NON_CAPTURE_CHECKS,
+  QUIETS,
+  QUIET_CHECKS,
   EVASIONS,
   NON_EVASIONS,
-  ALL_MOVES
+  LEGAL
+};
+
+struct ExtMove {
+  Move move;
+  Value value;
+
+  operator Move() const { return move; }
+  void operator=(Move m) { move = m; }
 };
 
-template<MoveGeneration T>
-MoveStack* generate(const Position& pos, MoveStack* mlist);
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+  return f.value < s.value;
+}
+
+template<GenType>
+ExtMove* generate(const Position& pos, ExtMove* moveList);
 
-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(). It sometimes comes
+/// in handy to use this class instead of the low level generate() function.
+template<GenType T>
+struct MoveList {
 
+  explicit MoveList(const Position& pos) : last(generate<T>(pos, moveList)) {}
+  const ExtMove* begin() const { return moveList; }
+  const ExtMove* end() const { return last; }
+  size_t size() const { return last - moveList; }
+  bool contains(Move move) const {
+    for (const auto& m : *this) if (m == move) return true;
+    return false;
+  }
+
+private:
+  ExtMove moveList[MAX_MOVES], *last;
+};
 
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#endif // #ifndef MOVEGEN_H_INCLUDED