From b4acf83704c9bab4d78d9ec76ecbdfbfa0b0c88c Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 8 Jan 2011 17:34:17 +0100 Subject: [PATCH] Ressurect move.cpp Actually it is san.cpp renamed. Because now has the move conversions functions and doesn't have any more the bulky move_from_san(), it is better to call it move.cpp Remove san.h while there. No functional change. Signed-off-by: Marco Costalba --- src/Makefile | 4 ++-- src/{san.cpp => move.cpp} | 2 +- src/move.h | 12 ++++++++++- src/position.cpp | 1 - src/san.h | 45 --------------------------------------- src/search.cpp | 2 +- src/uci.cpp | 1 - 7 files changed, 15 insertions(+), 52 deletions(-) rename src/{san.cpp => move.cpp} (99%) delete mode 100644 src/san.h diff --git a/src/Makefile b/src/Makefile index f126afac..513e3257 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,8 +32,8 @@ 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 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 + misc.o move.o movegen.o history.o movepick.o search.o position.o \ + tt.o uci.o ucioption.o book.o bitbase.o benchmark.o timeman.o ### ========================================================================== diff --git a/src/san.cpp b/src/move.cpp similarity index 99% rename from src/san.cpp rename to src/move.cpp index 1fc8d13c..221aac60 100644 --- a/src/san.cpp +++ b/src/move.cpp @@ -28,8 +28,8 @@ #include #include +#include "move.h" #include "movegen.h" -#include "san.h" using std::string; diff --git a/src/move.h b/src/move.h index 6070dca9..1752b835 100644 --- a/src/move.h +++ b/src/move.h @@ -17,13 +17,15 @@ along with this program. If not, see . */ - #if !defined(MOVE_H_INCLUDED) #define MOVE_H_INCLUDED +#include + #include "misc.h" #include "piece.h" #include "square.h" +#include "value.h" // Maximum number of allowed moves per position const int MOVES_MAX = 256; @@ -185,4 +187,12 @@ inline bool move_is_ok(Move m) { return move_from(m) != move_to(m); // Catches also MOVE_NONE } +class Position; + +extern const std::string move_to_uci(Move m, bool chess960); +extern Move move_from_uci(const Position& pos, const std::string& str); +extern const std::string move_to_san(Position& pos, Move m); +extern const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines); +extern const std::string pretty_pv(const Position& pos, int time, int depth, Value score, ValueType type, Move pv[]); + #endif // !defined(MOVE_H_INCLUDED) diff --git a/src/position.cpp b/src/position.cpp index 9c61cc88..f304d94a 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -36,7 +36,6 @@ #include "position.h" #include "psqtab.h" #include "rkiss.h" -#include "san.h" #include "tt.h" #include "ucioption.h" diff --git a/src/san.h b/src/san.h deleted file mode 100644 index 13c1f653..00000000 --- a/src/san.h +++ /dev/null @@ -1,45 +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 . -*/ - - -#if !defined(SAN_H_INCLUDED) -#define SAN_H_INCLUDED - -//// -//// Includes -//// - -#include - -#include "move.h" -#include "position.h" -#include "value.h" - - -//// -//// Prototypes -//// - -extern const std::string move_to_uci(Move m, bool chess960); -extern Move move_from_uci(const Position& pos, const std::string& str); -extern const std::string move_to_san(Position& pos, Move m); -extern const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines); -extern const std::string pretty_pv(const Position& pos, int time, int depth, Value score, ValueType type, Move pv[]); - -#endif // !defined(SAN_H_INCLUDED) diff --git a/src/search.cpp b/src/search.cpp index 28443b70..011bec69 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -34,10 +34,10 @@ #include "evaluate.h" #include "history.h" #include "misc.h" +#include "move.h" #include "movegen.h" #include "movepick.h" #include "lock.h" -#include "san.h" #include "search.h" #include "timeman.h" #include "thread.h" diff --git a/src/uci.cpp b/src/uci.cpp index 46cd39ea..c1073ad5 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -33,7 +33,6 @@ #include "move.h" #include "movegen.h" #include "position.h" -#include "san.h" #include "search.h" #include "ucioption.h" -- 2.39.2