X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=36db8d2b65200a9bb5e2f829d35a0ae0722ef253;hp=f558d73c67992138f1d96ec12521f8ed26027539;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=8c9c51c721f01eaf000924f493ced2ab6bec9e91

diff --git a/src/position.cpp b/src/position.cpp
index f558d73c..36db8d2b 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -190,7 +190,7 @@ void Position::from_fen(const std::string& fen) {
       i++;
 
   // En passant square
-  if (    i < fen.length() - 2
+  if (    i <= fen.length() - 2
       && (fen[i] >= 'a' && fen[i] <= 'h')
       && (fen[i+1] == '3' || fen[i+1] == '6'))
       st->epSquare = square_from_string(fen.substr(i, 2));
@@ -479,7 +479,6 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
       return true;
 
   Color us = side_to_move();
-  Color them = opposite_color(us);
   Square from = move_from(m);
   Square ksq = king_square(us);
 
@@ -491,6 +490,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
   // after the move is made
   if (move_is_ep(m))
   {
+      Color them = opposite_color(us);
       Square to = move_to(m);
       Square capsq = make_square(square_file(to), square_rank(from));
       Bitboard b = occupied_squares();
@@ -511,11 +511,12 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
   // If the moving piece is a king, check whether the destination
   // square is attacked by the opponent.
   if (from == ksq)
-      return !(square_is_attacked(move_to(m), them));
+      return !(square_is_attacked(move_to(m), opposite_color(us)));
 
   // A non-king move is legal if and only if it is not pinned or it
   // is moving along the ray towards or away from the king.
-  return (   !bit_is_set(pinned, from)
+  return (   !pinned
+          || !bit_is_set(pinned, from)
           || (direction_between_squares(from, ksq) == direction_between_squares(move_to(m), ksq)));
 }
 
@@ -551,7 +552,8 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const {
       if (bit_is_set(pawn_attacks(them, ksq), to)) // Normal check?
           return true;
 
-      if (    bit_is_set(dcCandidates, from)      // Discovered check?
+      if (   dcCandidates // Discovered check?
+          && bit_is_set(dcCandidates, from)
           && (direction_between_squares(from, ksq) != direction_between_squares(to, ksq)))
           return true;
 
@@ -590,22 +592,26 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const {
       }
       return false;
 
+  // Test discovered check and normal check according to piece type
   case KNIGHT:
-    return   bit_is_set(dcCandidates, from)              // Discovered check?
-          || bit_is_set(piece_attacks<KNIGHT>(ksq), to); // Normal check?
+    return   (dcCandidates && bit_is_set(dcCandidates, from))
+          || bit_is_set(piece_attacks<KNIGHT>(ksq), to);
 
   case BISHOP:
-    return   bit_is_set(dcCandidates, from)              // Discovered check?
-          || bit_is_set(piece_attacks<BISHOP>(ksq), to); // Normal check?
+    return   (dcCandidates && bit_is_set(dcCandidates, from))
+          || (   direction_between_squares(ksq, to) != DIR_NONE
+              && bit_is_set(piece_attacks<BISHOP>(ksq), to));
 
   case ROOK:
-    return   bit_is_set(dcCandidates, from)              // Discovered check?
-          || bit_is_set(piece_attacks<ROOK>(ksq), to);   // Normal check?
+    return   (dcCandidates && bit_is_set(dcCandidates, from))
+          || (   direction_between_squares(ksq, to) != DIR_NONE
+              && bit_is_set(piece_attacks<ROOK>(ksq), to));
 
   case QUEEN:
       // Discovered checks are impossible!
       assert(!bit_is_set(dcCandidates, from));
-      return bit_is_set(piece_attacks<QUEEN>(ksq), to);  // Normal check?
+      return (   direction_between_squares(ksq, to) != DIR_NONE
+              && bit_is_set(piece_attacks<QUEEN>(ksq), to));
 
   case KING:
       // Discovered check?
@@ -1848,15 +1854,14 @@ Value Position::compute_value() const {
 Value Position::compute_non_pawn_material(Color c) const {
 
   Value result = Value(0);
-  Square s;
 
   for (PieceType pt = KNIGHT; pt <= QUEEN; pt++)
   {
       Bitboard b = pieces_of_color_and_type(c, pt);
-      while(b)
+      while (b)
       {
-          s = pop_1st_bit(&b);
-          assert(piece_on(s) == piece_of_color_and_type(c, pt));
+          assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt));
+          pop_1st_bit(&b);
           result += piece_value_midgame(pt);
       }
   }