X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=2721f152419b6d765b621551dba308e69b3a326a;hb=d4af15f682c1967450233ab62cba1a6c5d601df6;hp=18715683ec309330ca66b6eeb449415df93662ec;hpb=74160ac60266f9e6824a5a6417d8a0ac8c0b39cf;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 18715683..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 Marco Costalba
+ 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 .
*/
-
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
-////
-//// Includes
-////
+#include "types.h"
+
+class Position;
+
+enum GenType {
+ CAPTURES,
+ QUIETS,
+ QUIET_CHECKS,
+ EVASIONS,
+ NON_EVASIONS,
+ LEGAL
+};
+
+struct ExtMove {
+ Move move;
+ Value value;
+
+ operator Move() const { return move; }
+ void operator=(Move m) { move = m; }
+};
-#include "position.h"
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.value < s.value;
+}
+template
+ExtMove* generate(const Position& pos, ExtMove* moveList);
-////
-//// Prototypes
-////
+/// 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
+struct MoveList {
-extern int generate_captures(const Position& pos, MoveStack* mlist);
-extern int generate_noncaptures(const Position& pos, MoveStack* mlist);
-extern int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc);
-extern int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned);
-extern int generate_legal_moves(const Position& pos, MoveStack* mlist);
-extern bool move_is_legal(const Position& pos, const Move m, Bitboard pinned);
+ explicit MoveList(const Position& pos) : last(generate(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