X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovegen.h;h=3f895f05ad481bdf9e092bfdd7ff814de906ad51;hb=b939c805139e4b37f04fbf177f580c35ebe9f130;hp=7b7c4e91bb4857094e7a21cb667452e72ad3cb8d;hpb=9e4befe3f1ea324bece88aee2e97b38659411c52;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 7b7c4e91..3f895f05 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -1,7 +1,6 @@
/*
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) 2004-2021 The Stockfish developers (see AUTHORS file)
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,28 +16,62 @@
along with this program. If not, see .
*/
-
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
-////
-//// Includes
-////
+#include
+
+#include "types.h"
+
+namespace Stockfish {
+
+class Position;
+
+enum GenType {
+ CAPTURES,
+ QUIETS,
+ QUIET_CHECKS,
+ EVASIONS,
+ NON_EVASIONS,
+ LEGAL
+};
+
+struct ExtMove {
+ Move move;
+ int value;
+
+ operator Move() const { return move; }
+ void operator=(Move m) { move = m; }
+
+ // Inhibit unwanted implicit conversions to Move
+ // with an ambiguity that yields to a compile error.
+ operator float() const = delete;
+};
+
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.value < s.value;
+}
-#include "position.h"
+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 {
-////
-//// Prototypes
-////
+ 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 {
+ return std::find(begin(), end(), move) != end();
+ }
-extern MoveStack* generate_captures(const Position& pos, MoveStack* mlist);
-extern MoveStack* generate_noncaptures(const Position& pos, MoveStack* mlist);
-extern MoveStack* generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc);
-extern MoveStack* generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned);
-extern MoveStack* generate_legal_moves(const Position& pos, MoveStack* mlist);
-extern bool move_is_legal(const Position& pos, const Move m, Bitboard pinned);
-extern bool move_is_legal(const Position& pos, const Move m);
+private:
+ ExtMove moveList[MAX_MOVES], *last;
+};
+} // namespace Stockfish
-#endif // !defined(MOVEGEN_H_INCLUDED)
+#endif // #ifndef MOVEGEN_H_INCLUDED