/// move_from_uci() takes a position and a string representing a move in
-/// simple coordinate notation and returns an equivalent Move.
+/// simple coordinate notation and returns an equivalent Move if any.
+/// Moves are guaranteed to be legal.
Move move_from_uci(const Position& pos, const string& str) {
- MoveStack mlist[MOVES_MAX];
+ MoveStack mlist[MAX_MOVES];
MoveStack* last = generate<MV_LEGAL>(pos, mlist);
for (MoveStack* cur = mlist; cur != last; cur++)
assert(pos.is_ok());
assert(move_is_ok(m));
- MoveStack mlist[MOVES_MAX];
+ MoveStack mlist[MAX_MOVES];
Square from = move_from(m);
Square to = move_to(m);
PieceType pt = pos.type_of_piece_on(from);
// Collect all legal moves of piece type 'pt' with destination 'to'
MoveStack* last = generate<MV_LEGAL>(pos, mlist);
- int f = 0, r = 0;
+ int f = 0, r = 0, cnt = 0;
for (MoveStack* cur = mlist; cur != last; cur++)
if ( move_to(cur->move) == to
&& pos.type_of_piece_on(move_from(cur->move)) == pt)
{
+ cnt++;
+
if (square_file(move_from(cur->move)) == square_file(from))
f++;
r++;
}
- assert(f > 0 && r > 0);
+ assert(cnt > 0 && f > 0 && r > 0);
// Disambiguation if we have more then one piece with destination 'to'
- if (f == 1 && r > 1)
- san += file_to_char(square_file(from));
- else if (f > 1 && r == 1)
- san += rank_to_char(square_rank(from));
- else if (f > 1 && r > 1)
- san += square_to_string(from);
+ if (cnt > 1)
+ {
+ if (f == 1)
+ san += file_to_char(square_file(from));
+ else if (r == 1)
+ san += rank_to_char(square_rank(from));
+ else
+ san += square_to_string(from);
+ }
}
if (pos.move_is_capture(m))
}
}
- // The move gives check? We don't use pos.move_is_check() here
+ // The move gives check? We don't use pos.move_gives_check() here
// because we need to test for a mate after the move is done.
StateInfo st;
pos.do_move(m, st);
- if (pos.is_check())
+ if (pos.in_check())
san += pos.is_mate() ? "#" : "+";
pos.undo_move(m);