X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=950994ef898b4843a869cd22898dbf933ada88e8;hp=35bc45aea2dd1f4105571db9aefb1a1fbc9b69ef;hb=2dfc94e0b6e011b0eb769fa0f0fcf9f2c4a2987b;hpb=e9296d694c72c2378b71ad29cfff2f2c7b45bb0c

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 35bc45ae..950994ef 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -145,22 +145,22 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
       passed   = !(theirPawns & passed_pawn_mask(Us, s));
       doubled  =   ourPawns   & squares_in_front_of(Us, s);
       opposed  =   theirPawns & squares_in_front_of(Us, s);
-      isolated = !(ourPawns   & neighboring_files_bb(f));
-      chain    =   ourPawns   & neighboring_files_bb(f) & b;
+      isolated = !(ourPawns   & adjacent_files_bb(f));
+      chain    =   ourPawns   & adjacent_files_bb(f) & b;
 
       // Test for backward pawn
       backward = false;
 
       // If the pawn is passed, isolated, or member of a pawn chain it cannot
-      // be backward. If there are friendly pawns behind on neighboring files
+      // be backward. If there are friendly pawns behind on adjacent files
       // or if can capture an enemy pawn it cannot be backward either.
       if (   !(passed | isolated | chain)
           && !(ourPawns & attack_span_mask(Them, s))
           && !(pos.attacks_from<PAWN>(s, Us) & theirPawns))
       {
           // We now know that there are no friendly pawns beside or behind this
-          // pawn on neighboring files. We now check whether the pawn is
-          // backward by looking in the forward direction on the neighboring
+          // pawn on adjacent files. We now check whether the pawn is
+          // backward by looking in the forward direction on the adjacent
           // files, and seeing whether we meet a friendly or an enemy pawn first.
           b = pos.attacks_from<PAWN>(s, Us);
 
@@ -178,8 +178,8 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
 
       // A not passed pawn is a candidate to become passed if it is free to
       // advance and if the number of friendly pawns beside or behind this
-      // pawn on neighboring files is higher or equal than the number of
-      // enemy pawns in the forward direction on the neighboring files.
+      // pawn on adjacent files is higher or equal than the number of
+      // enemy pawns in the forward direction on the adjacent files.
       candidate =   !(opposed | passed | backward | isolated)
                  && (b = attack_span_mask(Them, s + pawn_push(Us)) & ourPawns) != 0
                  &&  popcount<Max15>(b) >= popcount<Max15>(attack_span_mask(Us, s) & theirPawns);
@@ -188,7 +188,7 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
       // full attack info to evaluate passed pawns. Only the frontmost passed
       // pawn on each file is considered a true passed pawn.
       if (passed && !doubled)
-          set_bit(&(pi->passedPawns[Us]), s);
+          pi->passedPawns[Us] |= s;
 
       // Score this pawn
       if (isolated)
@@ -222,7 +222,7 @@ Score PawnInfo::updateShelter(const Position& pos, Square ksq) {
 
   if (relative_rank(Us, ksq) <= RANK_4)
   {
-      pawns = pos.pieces(PAWN, Us) & this_and_neighboring_files_bb(file_of(ksq));
+      pawns = pos.pieces(PAWN, Us) & this_and_adjacent_files_bb(file_of(ksq));
       r = ksq & (7 << 3);
       for (int i = 0; i < 3; i++)
       {