Retire move.cpp

Move its functions where they belong.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

src/Makefile

@@ -34,7 +34,7 @@ PGOBENCH = ./$(EXE) bench 32 1 10 default depth
 
 ### Object files
 OBJS = bitboard.o pawns.o material.o endgame.o evaluate.o main.o \
-	misc.o move.o movegen.o history.o movepick.o search.o position.o \
+	misc.o movegen.o history.o movepick.o search.o position.o \
 	tt.o uci.o ucioption.o book.o bitbase.o san.o benchmark.o timeman.o
 
 

src/benchmark.cpp

@@ -22,6 +22,7 @@
 //// Includes
 ////
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 #include "search.h"

src/book.cpp

@@ -30,6 +30,7 @@
 ////
 
 #include <cassert>
+#include <iostream>
 
 #include "book.h"
 #include "movegen.h"

src/move.cpp

@@ -1,152 +0,0 @@
-/*
-  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
-
-  Stockfish is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Stockfish is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-////
-//// Includes
-////
-
-#include <cassert>
-#include <cctype>
-
-#include "move.h"
-#include "piece.h"
-#include "position.h"
-
-
-////
-//// Functions
-////
-
-/// move_from_uci() takes a position and a string as input, and attempts to
-/// convert the string to a move, using simple coordinate notation (g1f3,
-/// a7a8q, etc.). In order to correctly parse en passant captures and castling
-/// moves, we need the position. This function is not robust, and expects that
-/// the input move is legal and correctly formatted.
-
-Move move_from_uci(const Position& pos, const std::string& str) {
-
-  Square from, to;
-  Piece piece;
-  Color us = pos.side_to_move();
-
-  if (str.length() < 4)
-      return MOVE_NONE;
-
-  // Read the from and to squares
-  from = make_square(file_from_char(str[0]), rank_from_char(str[1]));
-  to   = make_square(file_from_char(str[2]), rank_from_char(str[3]));
-
-  // Find the moving piece
-  piece = pos.piece_on(from);
-
-  // If the string has more than 4 characters, try to interpret the 5th
-  // character as a promotion.
-  if (str.length() > 4 && piece == piece_of_color_and_type(us, PAWN))
-  {
-      switch (tolower(str[4])) {
-      case 'n':
-          return make_promotion_move(from, to, KNIGHT);
-      case 'b':
-          return make_promotion_move(from, to, BISHOP);
-      case 'r':
-          return make_promotion_move(from, to, ROOK);
-      case 'q':
-          return make_promotion_move(from, to, QUEEN);
-      }
-  }
-
-  // En passant move? We assume that a pawn move is an en passant move
-  // if the destination square is epSquare.
-  if (to == pos.ep_square() && piece == piece_of_color_and_type(us, PAWN))
-      return make_ep_move(from, to);
-
-  // Is this a castling move? A king move is assumed to be a castling move
-  // if the destination square is occupied by a friendly rook, or if the
-  // distance between the source and destination squares is more than 1.
-  if (piece == piece_of_color_and_type(us, KING))
-  {
-      if (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
-          return make_castle_move(from, to);
-
-      if (square_distance(from, to) > 1)
-      {
-          // This is a castling move, but we have to translate it to the
-          // internal "king captures rook" representation.
-          SquareDelta delta = (to > from ? DELTA_E : DELTA_W);
-          Square s = from;
-
-          do s += delta;
-          while (   pos.piece_on(s) != piece_of_color_and_type(us, ROOK)
-                 && relative_rank(us, s) == RANK_1);
-
-          return relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE;
-      }
-  }
-
-  return make_move(from, to);
-}
-
-
-/// move_to_uci() converts a move to a string in coordinate notation
-/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
-/// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
-/// Chess960 mode.
-
-const std::string move_to_uci(Move move, bool chess960) {
-
-  std::string str;
-  Square from = move_from(move);
-  Square to = move_to(move);
-
-  if (move == MOVE_NONE)
-      str = "(none)";
-  else if (move == MOVE_NULL)
-      str = "0000";
-  else
-  {
-      if (move_is_short_castle(move) && !chess960)
-          return (from == SQ_E1 ? "e1g1" : "e8g8");
-
-      if (move_is_long_castle(move) && !chess960)
-          return (from == SQ_E1 ? "e1c1" : "e8c8");
-
-      str = square_to_string(from) + square_to_string(to);
-      if (move_is_promotion(move))
-          str += char(tolower(piece_type_to_char(move_promotion_piece(move))));
-  }
-  return str;
-}
-
-
-/// Overload the << operator, to make it easier to print moves
-
-std::ostream& operator << (std::ostream& os, Move m) {
-
-  bool chess960 = (os.iword(0) != 0); // See set960()
-  return os << move_to_uci(m, chess960);
-}
-
-
-/// move_is_ok(), for debugging
-
-bool move_is_ok(Move m) {
-
-  return move_from(m) != move_to(m); // Catches also MOVE_NONE
-}

src/move.h

@@ -21,12 +21,6 @@
 #if !defined(MOVE_H_INCLUDED)
 #define MOVE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include <iostream>
-
 #include "misc.h"
 #include "piece.h"
 #include "square.h"
@@ -34,12 +28,6 @@
 // Maximum number of allowed moves per position
 const int MOVES_MAX = 256;
 
-////
-//// Types
-////
-
-class Position;
-
 /// A move needs 16 bits to be stored
 ///
 /// bit  0- 5: destination square (from 0 to 63)
@@ -140,9 +128,6 @@ inline T pick_best(T* curMove, T* lastMove)
     return bestMove;
 }
 
-////
-//// Inline functions
-////
 
 inline Square move_from(Move m) {
   return Square((int(m) >> 6) & 0x3F);
@@ -196,14 +181,8 @@ inline Move make_castle_move(Square from, Square to) {
   return Move(int(to) | (int(from) << 6) | (3 << 14));
 }
 
-
+inline bool move_is_ok(Move m) {
-////
+  return move_from(m) != move_to(m); // Catches also MOVE_NONE
-//// Prototypes
+}
-////
-
-extern std::ostream& operator<<(std::ostream& os, Move m);
-extern Move move_from_uci(const Position& pos, const std::string &str);
-extern const std::string move_to_uci(Move m, bool chess960);
-extern bool move_is_ok(Move m);
 
 #endif // !defined(MOVE_H_INCLUDED)

src/position.h

@@ -47,6 +47,8 @@ const int MaxGameLength = 220;
 //// Types
 ////
 
+class Position;
+
 /// struct checkInfo is initialized at c'tor time and keeps
 /// info used to detect if a move gives check.
 

src/search.cpp

@@ -161,13 +161,19 @@ namespace {
   // operator<<() that will use it to properly format castling moves.
   enum set960 {};
 
-  std::ostream& operator<< (std::ostream& os, const set960& m) {
+  std::ostream& operator<< (std::ostream& os, const set960& f) {
 
-    os.iword(0) = int(m);
+    os.iword(0) = int(f);
     return os;
   }
 
 
+  // Overload operator << for moves to make it easier to print moves in
+  // coordinate notation compatible with UCI protocol.
+
+  std::ostream& operator<<(std::ostream& os, Move m);
+
+
   /// Adjustments
 
   // Step 6. Razoring
@@ -2711,4 +2717,35 @@ split_point_start: // At split points actual search starts from here
               }
   }
 
+  // Overload operator << to make it easier to print moves in coordinate notation
+  // (g1f3, a7a8q, etc.). The only special case is castling moves, where we
+  // print in the e1g1 notation in normal chess mode, and in e1h1 notation in
+  // Chess960 mode.
+
+  std::ostream& operator<<(std::ostream& os, Move m) {
+
+    Square from = move_from(m);
+    Square to = move_to(m);
+    bool chess960 = (os.iword(0) != 0); // See set960()
+
+    if (m == MOVE_NONE)
+        return os << "(none)";
+
+    if (m == MOVE_NULL)
+        return os << "0000";
+
+    if (move_is_short_castle(m) && !chess960)
+        return os << (from == SQ_E1 ? "e1g1" : "e8g8");
+
+    if (move_is_long_castle(m) && !chess960)
+        return os << (from == SQ_E1 ? "e1c1" : "e8c8");
+
+    os << square_to_string(from) << square_to_string(to);
+
+    if (move_is_promotion(m))
+        os << char(tolower(piece_type_to_char(move_promotion_piece(m))));
+
+    return os;
+  }
+
 } // namespace

src/search.h

@@ -66,6 +66,7 @@ struct SearchStack {
 ////
 //// Prototypes
 ////
+class Position;
 
 extern void init_search();
 extern void init_threads();

src/tt.cpp

@@ -24,6 +24,7 @@
 
 #include <cassert>
 #include <cstring>
+#include <iostream>
 
 #include "tt.h"
 

src/tt.h

@@ -21,9 +21,7 @@
 #if !defined(TT_H_INCLUDED)
 #define TT_H_INCLUDED
 
-////
+#include <iostream>
-//// Includes
-////
 
 #include "depth.h"
 #include "move.h"

src/uci.cpp

@@ -23,6 +23,7 @@
 ////
 
 #include <cassert>
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -53,6 +54,7 @@ namespace {
   void set_position(Position& pos, UCIParser& up);
   bool go(Position& pos, UCIParser& up);
   void perft(Position& pos, UCIParser& up);
+  Move parse_uci_move(const Position& pos, const std::string &str);
 }
 
 
@@ -132,6 +134,75 @@ bool execute_uci_command(const string& cmd) {
 
 namespace {
 
+  // parse_uci_move() takes a position and a string as input, and attempts to
+  // convert the string to a move, using simple coordinate notation (g1f3,
+  // a7a8q, etc.). In order to correctly parse en passant captures and castling
+  // moves, we need the position. This function is not robust, and expects that
+  // the input move is legal and correctly formatted.
+
+  Move parse_uci_move(const Position& pos, const std::string& str) {
+
+    Square from, to;
+    Piece piece;
+    Color us = pos.side_to_move();
+
+    if (str.length() < 4)
+        return MOVE_NONE;
+
+    // Read the from and to squares
+    from = make_square(file_from_char(str[0]), rank_from_char(str[1]));
+    to   = make_square(file_from_char(str[2]), rank_from_char(str[3]));
+
+    // Find the moving piece
+    piece = pos.piece_on(from);
+
+    // If the string has more than 4 characters, try to interpret the 5th
+    // character as a promotion.
+    if (str.length() > 4 && piece == piece_of_color_and_type(us, PAWN))
+    {
+        switch (tolower(str[4])) {
+        case 'n':
+            return make_promotion_move(from, to, KNIGHT);
+        case 'b':
+            return make_promotion_move(from, to, BISHOP);
+        case 'r':
+            return make_promotion_move(from, to, ROOK);
+        case 'q':
+            return make_promotion_move(from, to, QUEEN);
+        }
+    }
+
+    // En passant move? We assume that a pawn move is an en passant move
+    // if the destination square is epSquare.
+    if (to == pos.ep_square() && piece == piece_of_color_and_type(us, PAWN))
+        return make_ep_move(from, to);
+
+    // Is this a castling move? A king move is assumed to be a castling move
+    // if the destination square is occupied by a friendly rook, or if the
+    // distance between the source and destination squares is more than 1.
+    if (piece == piece_of_color_and_type(us, KING))
+    {
+        if (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
+            return make_castle_move(from, to);
+
+        if (square_distance(from, to) > 1)
+        {
+            // This is a castling move, but we have to translate it to the
+            // internal "king captures rook" representation.
+            SquareDelta delta = (to > from ? DELTA_E : DELTA_W);
+            Square s = from;
+
+            do s += delta;
+            while (   pos.piece_on(s) != piece_of_color_and_type(us, ROOK)
+                   && relative_rank(us, s) == RANK_1);
+
+            return relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE;
+        }
+    }
+
+    return make_move(from, to);
+  }
+
   // set_position() is called when Stockfish receives the "position" UCI
   // command. The input parameter is a UCIParser. It is assumed
   // that this parser has consumed the first token of the UCI command
@@ -170,7 +241,7 @@ namespace {
     StateInfo st;
     while (up >> token)
     {
-        move = move_from_uci(pos, token);
+        move = parse_uci_move(pos, token);
         pos.do_setup_move(move, st);
     }
     // Our StateInfo st is about going out of scope so copy
@@ -269,7 +340,7 @@ namespace {
         {
             int numOfMoves = 0;
             while (up >> token)
-                searchMoves[numOfMoves++] = move_from_uci(pos, token);
+                searchMoves[numOfMoves++] = parse_uci_move(pos, token);
 
             searchMoves[numOfMoves] = MOVE_NONE;
         }