X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovegen.h;h=6f1e24a4313107680c0508bd9a95722a3773af0d;hb=3c07603dac03f0da20194097cf4eb1a396fea60d;hp=636e439dc841f30604dbcc786c4c231afa702260;hpb=12f4bbc8f2b6122d9dc0949f3483e7dd3f26a829;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 636e439d..6f1e24a4 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-2015 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
@@ -17,27 +17,50 @@
along with this program. If not, see .
*/
-
-#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;
};
-template
-MoveStack* generate(const Position& pos, MoveStack* mlist);
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.value < s.value;
+}
-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);
+template
+ExtMove* generate(const Position& pos, ExtMove* moveList);
+/// 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 {
+
+ 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 m) const {
+ for (const ExtMove& ms : *this) if (ms.move == m) return true;
+ return false;
+ }
+
+private:
+ ExtMove moveList[MAX_MOVES], *last;
+};
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#endif // #ifndef MOVEGEN_H_INCLUDED