X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.h;h=f8c4f22c8b43ae1cde8f013c9dac2c85c0366e2d;hp=65d346b49696208aa07816e4e4cb04155c266f84;hb=d3608c4e79a29110f4c4a369d7207c6dd8e01f34;hpb=dc7fd868f4fa41251a9521a0b25e3adb483bfd83 diff --git a/src/movegen.h b/src/movegen.h index 65d346b4..f8c4f22c 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 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 @@ -41,11 +41,14 @@ MoveStack* generate(const Position& pos, MoveStack* mlist); template struct MoveList { - explicit MoveList(const Position& pos) : cur(mlist), last(generate(pos, mlist)) {} + explicit MoveList(const Position& pos) : cur(mlist), last(generate(pos, mlist)) { last->move = MOVE_NONE; } void operator++() { cur++; } - bool end() const { return cur == last; } - Move move() const { return cur->move; } - int size() const { return int(last - mlist); } + Move operator*() const { return cur->move; } + 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];