X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.h;h=71e9ca039870d08a6ebb364144c7d122d02a791e;hp=9f45e250912602003c366f1942412edb56cbc1ff;hb=99e547f4cb190e462d0c582b731a0fcf25ce1545;hpb=3b49aeb4f22569c2b5d5ca830858c4dd584fae7f diff --git a/src/movegen.h b/src/movegen.h index 9f45e250..71e9ca03 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 @@ -34,26 +34,25 @@ enum GenType { class Position; template -MoveStack* generate(const Position& pos, MoveStack* mlist); +ExtMove* generate(const Position& pos, ExtMove* mlist); /// The MoveList struct is a simple wrapper around generate(), sometimes comes /// 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)) {} + 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; } + 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; + for (const ExtMove* it(mlist); it != last; ++it) if (it->move == m) return true; return false; } private: - MoveStack mlist[MAX_MOVES]; - MoveStack *cur, *last; + ExtMove mlist[MAX_MOVES]; + ExtMove *cur, *last; }; #endif // !defined(MOVEGEN_H_INCLUDED)