From 676b2c8435502409145491f2f86454f11f99dae8 Mon Sep 17 00:00:00 2001
From: Marco Costalba <mcostalba@gmail.com>
Date: Fri, 6 Apr 2012 19:13:48 +0100
Subject: [PATCH] Replace Position::copy()

With assignment operator. And fix Position::flip().

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 src/benchmark.cpp |  2 +-
 src/position.cpp  | 30 ++++++++++--------------------
 src/position.h    | 10 +++-------
 src/thread.cpp    |  2 +-
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index f42c0e6c..67902062 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -107,7 +107,7 @@ void benchmark(istringstream& is) {
 
   for (size_t i = 0; i < fens.size(); i++)
   {
-      Position pos(fens[i], false, NULL);
+      Position pos(fens[i], false, Threads.main_thread());
 
       cerr << "\nPosition: " << i + 1 << '/' << fens.size() << endl;
 
diff --git a/src/position.cpp b/src/position.cpp
index 3a0f8b1c..318f0f2c 100644
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -92,16 +92,15 @@ CheckInfo::CheckInfo(const Position& pos) {
 }
 
 
-/// Position::copy() creates a copy of 'pos'. We want the new born Position
+/// Position::operator=() creates a copy of 'pos'. We want the new born Position
 /// object do not depend on any external data so we detach state pointer from
 /// the source one.
 
-void Position::copy(const Position& pos, Thread* th) {
+void Position::operator=(const Position& pos) {
 
   memcpy(this, &pos, sizeof(Position));
   startState = *st;
   st = &startState;
-  thisThread = th;
   nodes = 0;
 
   assert(pos_is_ok());
@@ -331,7 +330,7 @@ void Position::print(Move move) const {
 
   if (move)
   {
-      Position p(*this, thisThread);
+      Position p(*this);
       cout << "\nMove is: " << (sideToMove == BLACK ? ".." : "") << move_to_san(p, move);
   }
 
@@ -1540,21 +1539,20 @@ void Position::init() {
 
 void Position::flip() {
 
-  // Make a copy of current position before to start changing
-  const Position pos(*this, thisThread);
+  const Position pos(*this);
 
   clear();
+
+  sideToMove = ~pos.side_to_move();
   thisThread = pos.this_thread();
+  nodes = pos.nodes_searched();
+  chess960 = pos.is_chess960();
+  startPosPly = pos.startpos_ply_counter();
 
-  // Board
   for (Square s = SQ_A1; s <= SQ_H8; s++)
       if (!pos.square_empty(s))
           put_piece(Piece(pos.piece_on(s) ^ 8), ~s);
 
-  // Side to move
-  sideToMove = ~pos.side_to_move();
-
-  // Castling rights
   if (pos.can_castle(WHITE_OO))
       set_castle_right(BLACK, ~pos.castle_rook_square(WHITE_OO));
   if (pos.can_castle(WHITE_OOO))
@@ -1564,22 +1562,14 @@ void Position::flip() {
   if (pos.can_castle(BLACK_OOO))
       set_castle_right(WHITE, ~pos.castle_rook_square(BLACK_OOO));
 
-  // En passant square
   if (pos.st->epSquare != SQ_NONE)
       st->epSquare = ~pos.st->epSquare;
 
-  // Checkers
-  st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove);
-
-  // Hash keys
   st->key = compute_key();
   st->pawnKey = compute_pawn_key();
   st->materialKey = compute_material_key();
-
-  // Incremental scores
   st->psqScore = compute_psq_score();
-
-  // Material
+  st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(~sideToMove);
   st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
   st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
 
diff --git a/src/position.h b/src/position.h
index b59e5923..946608c6 100644
--- a/src/position.h
+++ b/src/position.h
@@ -84,18 +84,14 @@ struct StateInfo {
 ///    * A counter for detecting 50 move rule draws.
 
 class Position {
-
-  // No copy c'tor or assignment operator allowed
-  Position(const Position&);
-  Position& operator=(const Position&);
-
 public:
   Position() {}
-  Position(const Position& p, Thread* t) { copy(p, t); }
+  Position(const Position& p) { *this = p; }
+  Position(const Position& p, Thread* t) { *this = p; thisThread = t; }
   Position(const std::string& f, bool c960, Thread* t) { from_fen(f, c960, t); }
+  void operator=(const Position&);
 
   // Text input/output
-  void copy(const Position& pos, Thread* th);
   void from_fen(const std::string& fen, bool isChess960, Thread* th);
   const std::string to_fen() const;
   void print(Move m = MOVE_NONE) const;
diff --git a/src/thread.cpp b/src/thread.cpp
index fe7a669b..cb3f8223 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -434,7 +434,7 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi
   Signals.stopOnPonderhit = Signals.firstRootMove = false;
   Signals.stop = Signals.failedLowAtRoot = false;
 
-  RootPosition.copy(pos, main_thread());
+  RootPosition = pos;
   Limits = limits;
   RootMoves.clear();
 
-- 
2.39.2