X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=9a39d1c50ea299ce53c44d1de7e38b78ee9556ae;hb=HEAD;hp=9db23dd407c1d23e35d03cb4874040005c3b931b;hpb=8ceef922662c75c33d105d99732475c125b01081;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 9db23dd4..9a39d1c5 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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2004-2023 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,43 +16,61 @@
along with this program. If not, see .
*/
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
+#include // IWYU pragma: keep
+#include
+
#include "types.h"
+namespace Stockfish {
+
+class Position;
+
enum GenType {
- CAPTURES,
- QUIETS,
- QUIET_CHECKS,
- EVASIONS,
- NON_EVASIONS,
- LEGAL
+ CAPTURES,
+ QUIETS,
+ QUIET_CHECKS,
+ EVASIONS,
+ NON_EVASIONS,
+ LEGAL
};
-class Position;
+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; }
template
-MoveStack* generate(const Position& pos, MoveStack* mlist);
+ExtMove* generate(const Position& pos, ExtMove* moveList);
-/// The MoveList struct is a simple wrapper around generate(), sometimes comes
-/// handy to use this class instead of the low level generate() function.
+// The MoveList struct wraps the generate() function and returns a convenient
+// list of moves. Using MoveList is sometimes preferable to directly calling
+// the lower level generate() function.
template
struct MoveList {
- explicit MoveList(const Position& pos) : cur(mlist), last(generate(pos, mlist)) {}
- void operator++() { cur++; }
- Move operator*() const { return cur->move; }
- bool end() const { return cur == last; }
- size_t size() const { return last - mlist; }
- bool contains(Move m) const {
- for (const MoveStack* it(mlist); it != last; ++it) if (it->move == m) return true;
- return false;
- }
-
-private:
- MoveStack mlist[MAX_MOVES];
- MoveStack *cur, *last;
+ 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(); }
+
+ private:
+ ExtMove moveList[MAX_MOVES], *last;
};
-#endif // !defined(MOVEGEN_H_INCLUDED)
+} // namespace Stockfish
+
+#endif // #ifndef MOVEGEN_H_INCLUDED