X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=c18fa07c0d1dee5e88b5d5a206deac2f4eb69331;hb=77341f67f30456dc456177062309ad5e73e2e1a4;hp=e16a8ab5a80cfad0a665bb9a21694194471dcc75;hpb=5c81602d14539f8259a715477315e28b5de7cb54;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index e16a8ab5..c18fa07c 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-2009 Marco Costalba
+ Copyright (C) 2008-2014 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,42 @@
along with this program. If not, see .
*/
-
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
-////
-//// Includes
-////
-
-#include "position.h"
-
-
-////
-//// Prototypes
-////
-
-extern int generate_captures(const Position& pos, MoveStack* mlist);
-extern int generate_noncaptures(const Position& pos, MoveStack* mlist);
-extern int generate_non_capture_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);
-
-
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#include "types.h"
+
+enum GenType {
+ CAPTURES,
+ QUIETS,
+ QUIET_CHECKS,
+ EVASIONS,
+ NON_EVASIONS,
+ LEGAL
+};
+
+class Position;
+
+template
+ExtMove* generate(const Position& pos, ExtMove* mlist);
+
+/// 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) : cur(mlist), last(generate(pos, mlist)) { last->move = MOVE_NONE; }
+ void operator++() { ++cur; }
+ Move operator*() const { return cur->move; }
+ size_t size() const { return last - mlist; }
+ bool contains(Move m) const {
+ for (const ExtMove* it(mlist); it != last; ++it) if (it->move == m) return true;
+ return false;
+ }
+
+private:
+ ExtMove mlist[MAX_MOVES];
+ ExtMove *cur, *last;
+};
+
+#endif // #ifndef MOVEGEN_H_INCLUDED