X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=62a121d7d291629e37aeebe32afe32fbc29776c6;hb=856a5f3aaaf8b9d53599963decacd4476b55c034;hp=6a7f7e3ac51b4115f99e7bcef8a3296a7f69c39c;hpb=6fa6da3ee13d2b7bdbec3cd24ff8ca43233c74fb;p=stockfish diff --git a/src/movegen.h b/src/movegen.h index 6a7f7e3a..62a121d7 100644 --- a/src/movegen.h +++ b/src/movegen.h @@ -36,9 +36,6 @@ enum GenType { struct ExtMove { Move move; Value value; - - operator Move() const { return move; } - void operator=(Move m) { move = m; } }; inline bool operator<(const ExtMove& f, const ExtMove& s) { @@ -53,17 +50,18 @@ ExtMove* generate(const Position& pos, ExtMove* moveList); template struct MoveList { - explicit MoveList(const Position& pos) : last(generate(pos, moveList)) {} - const ExtMove* begin() const { return moveList; } - const ExtMove* end() const { return last; } + explicit MoveList(const Position& pos) : cur(moveList), last(generate(pos, moveList)) { last->move = MOVE_NONE; } + void operator++() { ++cur; } + Move operator*() const { return cur->move; } size_t size() const { return last - moveList; } - bool contains(Move move) const { - for (const auto& m : *this) if (m == move) return true; + bool contains(Move m) const { + for (const ExtMove* it(moveList); it != last; ++it) if (it->move == m) return true; return false; } private: - ExtMove moveList[MAX_MOVES], *last; + ExtMove moveList[MAX_MOVES]; + ExtMove *cur, *last; }; #endif // #ifndef MOVEGEN_H_INCLUDED