From: Marco Costalba Date: Sun, 26 Oct 2008 12:23:27 +0000 (+0100) Subject: Position: fix a couple of Intel compiler warnings X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=a5c1b3e8f68a9c98e6be1f90e7d0295d05c685de Position: fix a couple of Intel compiler warnings Plus usual trailing whitespace. Signed-off-by: Marco Costalba --- diff --git a/src/movepick.cpp b/src/movepick.cpp index 4ab5e892..68f03a30 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -39,7 +39,7 @@ namespace { /// Variables - MovePicker::MovegenPhase PhaseTable[32]; + MovePicker::MovegenPhase PhaseTable[32]; int MainSearchPhaseIndex; int EvasionsPhaseIndex; int QsearchWithChecksPhaseIndex; @@ -62,7 +62,7 @@ namespace { /// move ordering is at the current node. MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, - Move k1, Move k2, Depth d) : pos(p) { + Move k1, Move k2, Depth d) : pos(p) { pvNode = pvnode; ttMove = ttm; mateKiller = (mk == ttm)? MOVE_NONE : mk; @@ -147,13 +147,13 @@ Move MovePicker::get_next_move() { break; case PH_EVASIONS: - assert(pos.is_check()); + assert(pos.is_check()); numOfMoves = generate_evasions(pos, moves); score_evasions(); movesPicked = 0; break; - case PH_QCAPTURES: + case PH_QCAPTURES: numOfMoves = generate_captures(pos, moves); score_qcaptures(); movesPicked = 0; @@ -172,8 +172,6 @@ Move MovePicker::get_next_move() { return MOVE_NONE; } } - assert(false); - return MOVE_NONE; } @@ -192,7 +190,7 @@ Move MovePicker::get_next_move(Lock &lock) { if (m == MOVE_NONE) finished = true; - lock_release(&lock); + lock_release(&lock); return m; } @@ -273,20 +271,20 @@ void MovePicker::score_qcaptures() { } -/// find_best_index() loops across the moves and returns index of -/// the highest scored one. - -int MovePicker::find_best_index() { - - int bestScore = -10000000, bestIndex = -1; - - for (int i = movesPicked; i < numOfMoves; i++) - if (moves[i].score > bestScore) - { - bestIndex = i; - bestScore = moves[i].score; - } - return bestIndex; +/// find_best_index() loops across the moves and returns index of +/// the highest scored one. + +int MovePicker::find_best_index() { + + int bestScore = -10000000, bestIndex = -1; + + for (int i = movesPicked; i < numOfMoves; i++) + if (moves[i].score > bestScore) + { + bestIndex = i; + bestScore = moves[i].score; + } + return bestIndex; } @@ -435,8 +433,8 @@ Move MovePicker::pick_move_from_list() { } -/// MovePicker::current_move_type() returns the type of the just -/// picked next move. It can be used in search to further differentiate +/// MovePicker::current_move_type() returns the type of the just +/// picked next move. It can be used in search to further differentiate /// according to the current move type: capture, non capture, escape, etc. MovePicker::MovegenPhase MovePicker::current_move_type() const { diff --git a/src/position.cpp b/src/position.cpp index 0b45099c..67ee145c 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -235,7 +235,7 @@ const std::string Position::to_fen() const { fen += (char)skip + '0'; skip = 0; } - fen += pieceLetters[piece_on(sq)]; + fen += pieceLetters[piece_on(sq)]; } if (skip > 0) fen += (char)skip + '0'; @@ -327,7 +327,7 @@ Bitboard Position::hidden_checks(Color c, Square ksq) const { Square s; Bitboard sliders, result = EmptyBoardBB; - + if (Piece == ROOK) // Resolved at compile time sliders = rooks_and_queens(FindPinned ? opposite_color(c) : c) & RookPseudoAttacks[ksq]; else @@ -338,7 +338,7 @@ Bitboard Position::hidden_checks(Color c, Square ksq) const { // King blockers are candidate pinned pieces Bitboard candidate_pinned = piece_attacks(ksq) & pieces_of_color(c); - // Pinners are sliders, not checkers, that give check when + // Pinners are sliders, not checkers, that give check when // candidate pinned are removed. Bitboard pinners = (FindPinned ? sliders & ~checkersBB : sliders); @@ -410,7 +410,6 @@ bool Position::piece_attacks_square(Square f, Square t) const { case WR: case BR: return piece_attacks_square(f, t); case WQ: case BQ: return piece_attacks_square(f, t); case WK: case BK: return piece_attacks_square(f, t); - default: return false; } return false; } @@ -564,14 +563,14 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { switch (type_of_piece_on(from)) { case PAWN: - + if (bit_is_set(pawn_attacks(them, ksq), to)) // Normal check? return true; - + if ( bit_is_set(dcCandidates, from) // Discovered check? && (direction_between_squares(from, ksq) != direction_between_squares(to, ksq))) return true; - + if (move_promotion(m)) // Promotion with check? { Bitboard b = occupied_squares(); @@ -607,7 +606,7 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { } return false; - case KNIGHT: + case KNIGHT: return bit_is_set(dcCandidates, from) // Discovered check? || bit_is_set(piece_attacks(ksq), to); // Normal check? @@ -621,7 +620,7 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const { case QUEEN: // Discovered checks are impossible! - assert(!bit_is_set(dcCandidates, from)); + assert(!bit_is_set(dcCandidates, from)); return bit_is_set(piece_attacks(ksq), to); // Normal check? case KING: @@ -1337,7 +1336,6 @@ void Position::undo_castle_move(Move m) { // Position::undo_move. In particular, the side to move has been switched, // so the code below is correct. Color us = side_to_move(); - Color them = opposite_color(us); // Find source squares for king and rook Square kfrom = move_from(m); @@ -1396,7 +1394,7 @@ void Position::undo_castle_move(Move m) { /// Position::do_move, is used to put back the captured piece (if any). void Position::undo_promotion_move(Move m, const UndoInfo &u) { - + Color us, them; Square from, to; PieceType capture, promotion; @@ -2256,7 +2254,7 @@ bool Position::is_ok(int* failedStep) const { { if (mgValue != compute_mg_value()) return false; - + if (egValue != compute_eg_value()) return false; }