X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=c18fa07c0d1dee5e88b5d5a206deac2f4eb69331;hb=77341f67f30456dc456177062309ad5e73e2e1a4;hp=65d346b49696208aa07816e4e4cb04155c266f84;hpb=dc7fd868f4fa41251a9521a0b25e3adb483bfd83;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 65d346b4..c18fa07c 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-2014 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
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
#include "types.h"
@@ -34,22 +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.
+/// 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) : cur(mlist), last(generate(pos, mlist)) { last->move = MOVE_NONE; }
+ void operator++() { ++cur; }
+ Move operator*() const { return cur->move; }
+ size_t size() const { return last - mlist; }
+ bool contains(Move m) const {
+ 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)
+#endif // #ifndef MOVEGEN_H_INCLUDED