X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovegen.h;h=c93252a731859edc9a2421ee303cfe722e4baf3e;hb=e8f9447b11efd80a01733175c5076db988c45aa9;hp=0c2a8b25e6b0c4084c632358f88970bf158cae21;hpb=b5b799b5ab4de93aa8a03a310d2f178698a5cf86;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 0c2a8b25..c93252a7 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
@@ -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,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)) {}
- void operator++() { cur++; }
- bool end() const { return cur == last; }
- Move move() const { return cur->move; }
+ 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 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)
+#endif // #ifndef MOVEGEN_H_INCLUDED