Retire direction.h

Move all to square.h

No functional change.

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

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index e23e5b6bbb56447c404dccfaaf53190ed67ebe92..00854bb9a84a429d0856a5f4b5439bec308b56a2 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -26,7 +26,6 @@
 
 #include "bitboard.h"
 #include "bitcount.h"
 
 #include "bitboard.h"
 #include "bitcount.h"

-#include "direction.h"

 
 
 #if defined(IS_64BIT)
 
 
 #if defined(IS_64BIT)


@@ -481,7 +480,7 @@ namespace {
         for (Square s2 = SQ_A1; s2 <= SQ_H8; s2++)
         {
             BetweenBB[s1][s2] = EmptyBoardBB;
         for (Square s2 = SQ_A1; s2 <= SQ_H8; s2++)
         {
             BetweenBB[s1][s2] = EmptyBoardBB;

-            SignedDirection d = signed_direction_between_squares(s1, s2);
+            SignedDirection d = SignedDirection(SignedDirectionTable[s1][s2]);

 
             if (d != SIGNED_DIR_NONE)
             {
 
             if (d != SIGNED_DIR_NONE)
             {

diff --git a/src/bitboard.h b/src/bitboard.h
index e8f74fc5c5c22f3f0df5f2b5e9e856c8d13d6b96..bff9846c5eb9d730a4a3e5a0ddd6c67e4d2cfc59 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -26,7 +26,6 @@
 //// Includes
 ////
 
 //// Includes
 ////
 

-#include "direction.h"

 #include "piece.h"
 #include "square.h"
 #include "types.h"
 #include "piece.h"
 #include "square.h"
 #include "types.h"

diff --git a/src/direction.cpp b/src/direction.cpp
index 9d805765cf87b4c7a278d652450f5cf98bcc137e..0210381d86e6d0765694b28ce3b9326087f1e091 100644 (file)
--- a/src/direction.cpp
+++ b/src/direction.cpp
@@ -22,7 +22,6 @@
 //// Includes
 ////
 
 //// Includes
 ////
 

-#include "direction.h"

 #include "square.h"
 
 
 #include "square.h"
 
 

diff --git a/src/direction.h b/src/direction.h
deleted file mode 100644 (file)
index 0500840..0000000
--- a/src/direction.h
+++ /dev/null
@@ -1,86 +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/>.
-*/
-
-
-#if !defined(DIRECTION_H_INCLUDED)
-#define DIRECTION_H_INCLUDED
-
-////
-//// Includes
-////
-
-#include "square.h"
-#include "types.h"
-
-
-////
-//// Types
-////
-
-enum Direction {
-  DIR_E = 0, DIR_N = 1, DIR_NE = 2, DIR_NW = 3, DIR_NONE = 4
-};
-
-enum SignedDirection {
-  SIGNED_DIR_E  = 0, SIGNED_DIR_W  = 1,
-  SIGNED_DIR_N  = 2, SIGNED_DIR_S  = 3,
-  SIGNED_DIR_NE = 4, SIGNED_DIR_SW = 5,
-  SIGNED_DIR_NW = 6, SIGNED_DIR_SE = 7,
-  SIGNED_DIR_NONE = 8
-};
-
-ENABLE_OPERATORS_ON(SignedDirection);
-
-
-////
-//// Variables
-////
-
-extern uint8_t DirectionTable[64][64];
-extern uint8_t SignedDirectionTable[64][64];
-
-
-////
-//// Inline functions
-////
-
-inline Direction direction_between_squares(Square s1, Square s2) {
-  return Direction(DirectionTable[s1][s2]);
-}
-
-inline SignedDirection signed_direction_between_squares(Square s1, Square s2) {
-  return SignedDirection(SignedDirectionTable[s1][s2]);
-}
-
-inline int direction_is_diagonal(Square s1, Square s2) {
-  return DirectionTable[s1][s2] & 2;
-}
-
-inline bool direction_is_straight(Square s1, Square s2) {
-  return DirectionTable[s1][s2] < 2;
-}
-
-////
-//// Prototypes
-////
-
-extern void init_direction_table();
-
-
-#endif // !defined(DIRECTION_H_INCLUDED)

diff --git a/src/main.cpp b/src/main.cpp
index de77e5823eff1a756f249ae1119493d441890921..70359fdf77116adb652762d9c12fc9da8ba2560f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,7 +30,6 @@
 
 #include "bitboard.h"
 #include "bitcount.h"
 
 #include "bitboard.h"
 #include "bitcount.h"

-#include "direction.h"

 #include "endgame.h"
 #include "evaluate.h"
 #include "material.h"
 #include "endgame.h"
 #include "evaluate.h"
 #include "material.h"

diff --git a/src/position.h b/src/position.h
index bb574e1642f263b7b380ac6be6f618b4faa47bb2..5b1bc664be7782f713f1b8641e8aafe9058dc8e4 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -27,7 +27,6 @@
 
 #include "bitboard.h"
 #include "color.h"
 
 #include "bitboard.h"
 #include "color.h"

-#include "direction.h"

 #include "move.h"
 #include "piece.h"
 #include "square.h"
 #include "move.h"
 #include "piece.h"
 #include "square.h"

diff --git a/src/square.h b/src/square.h
index 88ae1363a6943263ead7095487f78b745f35a798..621e398fb19069180f141df29423c4af171de2b6 100644 (file)
--- a/src/square.h
+++ b/src/square.h
@@ -68,10 +68,23 @@ enum SquareDelta {
   DELTA_NW = DELTA_N + DELTA_W,
 };
 
   DELTA_NW = DELTA_N + DELTA_W,
 };
 

+enum Direction {
+  DIR_E = 0, DIR_N = 1, DIR_NE = 2, DIR_NW = 3, DIR_NONE = 4
+};
+
+enum SignedDirection {
+  SIGNED_DIR_E  = 0, SIGNED_DIR_W  = 1,
+  SIGNED_DIR_N  = 2, SIGNED_DIR_S  = 3,
+  SIGNED_DIR_NE = 4, SIGNED_DIR_SW = 5,
+  SIGNED_DIR_NW = 6, SIGNED_DIR_SE = 7,
+  SIGNED_DIR_NONE = 8
+};
+

 ENABLE_OPERATORS_ON(Square);
 ENABLE_OPERATORS_ON(File);
 ENABLE_OPERATORS_ON(Rank);
 ENABLE_OPERATORS_ON(SquareDelta);
 ENABLE_OPERATORS_ON(Square);
 ENABLE_OPERATORS_ON(File);
 ENABLE_OPERATORS_ON(Rank);
 ENABLE_OPERATORS_ON(SquareDelta);

+ENABLE_OPERATORS_ON(SignedDirection);

 
 
 ////
 
 
 ////


@@ -81,6 +94,9 @@ ENABLE_OPERATORS_ON(SquareDelta);
 const int FlipMask = 56;
 const int FlopMask =  7;
 
 const int FlipMask = 56;
 const int FlopMask =  7;
 

+extern uint8_t DirectionTable[64][64];
+extern uint8_t SignedDirectionTable[64][64];
+

 
 ////
 //// Inline functions
 
 ////
 //// Inline functions


@@ -181,4 +197,22 @@ inline bool square_is_ok(Square s) {
   return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
 }
 
   return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
 }
 

+inline Direction direction_between_squares(Square s1, Square s2) {
+  return Direction(DirectionTable[s1][s2]);
+}
+
+inline int direction_is_diagonal(Square s1, Square s2) {
+  return DirectionTable[s1][s2] & 2;
+}
+
+inline bool direction_is_straight(Square s1, Square s2) {
+  return DirectionTable[s1][s2] < 2;
+}
+
+////
+//// Prototypes
+////
+
+extern void init_direction_table();
+

 #endif // !defined(SQUARE_H_INCLUDED)
 #endif // !defined(SQUARE_H_INCLUDED)