Ressurect move.cpp

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 1b10c7b418697c969f00d8f8b9a4e0ed938db3db..c1073ad596831fafbb2750c8402b7b07d6515cc7 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -23,6 +23,7 @@
 ////
 
 #include <cassert>
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -32,7 +33,6 @@
 #include "move.h"
 #include "movegen.h"
 #include "position.h"
-#include "san.h"
 #include "search.h"
 #include "ucioption.h"
 
@@ -49,10 +49,10 @@ namespace {
   typedef istringstream UCIParser;
 
   // Local functions
-  void set_option(UCIParser& uip);
-  void set_position(Position& pos, UCIParser& uip);
-  bool go(Position& pos, UCIParser& uip);
-  void perft(Position& pos, UCIParser& uip);
+  void set_option(UCIParser& up);
+  void set_position(Position& pos, UCIParser& up);
+  bool go(Position& pos, UCIParser& up);
+  void perft(Position& pos, UCIParser& up);
 }
 
 
@@ -171,11 +171,7 @@ namespace {
     while (up >> token)
     {
         move = move_from_uci(pos, token);
-        pos.do_move(move, st);
-        if (pos.rule_50_counter() == 0)
-            pos.reset_game_ply();
-
-        pos.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50
+        pos.do_setup_move(move, st);
     }
     // Our StateInfo st is about going out of scope so copy
     // its content inside pos before it disappears.
@@ -287,7 +283,8 @@ namespace {
 
   void perft(Position& pos, UCIParser& up) {
 
-    int depth, tm, n;
+    int depth, tm;
+    int64_t n;
 
     if (!(up >> depth))
         return;