X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.h;h=9ea4cec93d5006b2769a01da049c381e5c501885;hb=cf0a2a26a9e2640dc86b26a998fb7a71a5c20b90;hp=38351e32f70c1b29eaf2df30acb5e197a2df980a;hpb=81cd417b4584b0e3830940c5cb122c898afde08a;p=stockfish
diff --git a/src/movegen.h b/src/movegen.h
index 38351e32..9ea4cec9 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-2010 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,40 +17,42 @@
along with this program. If not, see .
*/
-#if !defined(MOVEGEN_H_INCLUDED)
+#ifndef MOVEGEN_H_INCLUDED
#define MOVEGEN_H_INCLUDED
#include "types.h"
-enum MoveType {
- MV_CAPTURE,
- MV_NON_CAPTURE,
- MV_CHECK,
- MV_NON_CAPTURE_CHECK,
- MV_EVASION,
- MV_NON_EVASION,
- MV_LEGAL
+enum GenType {
+ CAPTURES,
+ QUIETS,
+ QUIET_CHECKS,
+ EVASIONS,
+ NON_EVASIONS,
+ LEGAL
};
class Position;
-template
-MoveStack* generate(const Position& pos, MoveStack* mlist);
+template
+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
+/// 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