X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovegen.h;h=3f895f05ad481bdf9e092bfdd7ff814de906ad51;hb=b939c805139e4b37f04fbf177f580c35ebe9f130;hp=0c781a6ba1c3aaa576628049652ea8e00ad609d1;hpb=155bed18f5224d401ddf5b4b71d93d8a8c379b3c;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 0c781a6b..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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ 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,39 +16,62 @@
along with this program. If not, see .
*/
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
-#include "move.h"
-#include "position.h"
-
-enum MoveType {
- MV_CAPTURE,
- MV_NON_CAPTURE,
- MV_CHECK,
- MV_NON_CAPTURE_CHECK,
- MV_EVASION,
- MV_NON_EVASION,
- MV_LEGAL
+#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;
};
-template
-MoveStack* generate(const Position& pos, MoveStack* mlist);
+inline bool operator<(const ExtMove& f, const ExtMove& s) {
+ return f.value < s.value;
+}
-/// The MoveList struct is a simple wrapper around generate(), sometimes comes
-/// handy to use this class instead of the low level generate() function.
-template
+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) : cur(mlist), last(generate(pos, mlist)) {}
- void operator++() { cur++; }
- bool end() const { return cur == last; }
- Move move() const { return cur->move; }
- int size() const { return int(last - mlist); }
+ 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:
- MoveStack mlist[MAX_MOVES];
- MoveStack *cur, *last;
+ ExtMove moveList[MAX_MOVES], *last;
};
-#endif // !defined(MOVEGEN_H_INCLUDED)
+} // namespace Stockfish
+
+#endif // #ifndef MOVEGEN_H_INCLUDED