X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsquare.h;h=bc5221b6b74578d2030042a4a3ddd6e69adda001;hb=5b2ac7590ccfe529698347981e45fdfa8a0a0780;hp=1c4a39023582c62de6fc92d5bd1bfee045624168;hpb=4dded4e72f9b9582db8adc9a478e9eda5841d8c5;p=stockfish

diff --git a/src/square.h b/src/square.h
index 1c4a3902..bc5221b6 100644
--- a/src/square.h
+++ b/src/square.h
@@ -17,25 +17,15 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(SQUARE_H_INCLUDED)
 #define SQUARE_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include <cstdlib> // for abs()
 #include <string>
 
 #include "color.h"
 #include "misc.h"
 
-
-////
-//// Types
-////
-
 enum Square {
   SQ_A1, SQ_B1, SQ_C1, SQ_D1, SQ_E1, SQ_F1, SQ_G1, SQ_H1,
   SQ_A2, SQ_B2, SQ_C2, SQ_D2, SQ_E2, SQ_F2, SQ_G2, SQ_H2,
@@ -45,20 +35,12 @@ enum Square {
   SQ_A6, SQ_B6, SQ_C6, SQ_D6, SQ_E6, SQ_F6, SQ_G6, SQ_H6,
   SQ_A7, SQ_B7, SQ_C7, SQ_D7, SQ_E7, SQ_F7, SQ_G7, SQ_H7,
   SQ_A8, SQ_B8, SQ_C8, SQ_D8, SQ_E8, SQ_F8, SQ_G8, SQ_H8,
-  SQ_NONE
-};
-
-enum File {
-  FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H, FILE_NONE
-};
-
-enum Rank {
-  RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8, RANK_NONE
-};
-
-enum SquareDelta {
+  SQ_NONE,
 
-  DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, DELTA_W = -1, DELTA_NONE = 0,
+  DELTA_N =  8,
+  DELTA_E =  1,
+  DELTA_S = -8,
+  DELTA_W = -1,
 
   DELTA_NN = DELTA_N + DELTA_N,
   DELTA_NE = DELTA_N + DELTA_E,
@@ -68,30 +50,23 @@ enum SquareDelta {
   DELTA_NW = DELTA_N + DELTA_W
 };
 
-ENABLE_OPERATORS_ON(Square);
-ENABLE_OPERATORS_ON(File);
-ENABLE_OPERATORS_ON(Rank);
-ENABLE_OPERATORS_ON(SquareDelta);
+enum File {
+  FILE_A, FILE_B, FILE_C, FILE_D, FILE_E, FILE_F, FILE_G, FILE_H
+};
 
+enum Rank {
+  RANK_1, RANK_2, RANK_3, RANK_4, RANK_5, RANK_6, RANK_7, RANK_8
+};
 
-////
-//// Constants
-////
+ENABLE_OPERATORS_ON(Square)
+ENABLE_OPERATORS_ON(File)
+ENABLE_OPERATORS_ON(Rank)
 
 const int FlipMask = 56;
 const int FlopMask =  7;
 
-////
-//// Inline functions
-////
-
-inline Square operator+ (Square x, SquareDelta i) { return x + Square(i); }
-inline void operator+= (Square& x, SquareDelta i) { x = x + Square(i); }
-inline Square operator- (Square x, SquareDelta i) { return x - Square(i); }
-inline void operator-= (Square& x, SquareDelta i) { x = x - Square(i); }
-
 inline Square make_square(File f, Rank r) {
-  return Square(int(f) | (int(r) << 3));
+  return Square((int(r) << 3) | int(f));
 }
 
 inline File square_file(Square s) {
@@ -114,33 +89,29 @@ inline Square relative_square(Color c, Square s) {
   return Square(int(s) ^ (int(c) * FlipMask));
 }
 
+inline Rank relative_rank(Color c, Rank r) {
+  return Rank(int(r) ^ (int(c) * 7));
+}
+
 inline Rank relative_rank(Color c, Square s) {
-  return square_rank(relative_square(c, s));
+  return relative_rank(c, square_rank(s));
 }
 
 inline SquareColor square_color(Square s) {
-  return SquareColor((int(square_file(s)) + int(square_rank(s))) & 1);
+  return SquareColor(int(square_rank(s) + s) & 1);
 }
 
-inline bool same_color_squares(Square s1, Square s2) {
+inline bool opposite_color_squares(Square s1, Square s2) {
   int s = int(s1) ^ int(s2);
-  return (((s >> 3) ^ s) & 1) == 0;
-}
-
-inline int file_distance(File f1, File f2) {
-  return abs(int(f1) - int(f2));
+  return ((s >> 3) ^ s) & 1;
 }
 
 inline int file_distance(Square s1, Square s2) {
-  return file_distance(square_file(s1), square_file(s2));
-}
-
-inline int rank_distance(Rank r1, Rank r2) {
-  return abs(int(r1) - int(r2));
+  return abs(square_file(s1) - square_file(s2));
 }
 
 inline int rank_distance(Square s1, Square s2) {
-  return rank_distance(square_rank(s1), square_rank(s2));
+  return abs(square_rank(s1) - square_rank(s2));
 }
 
 inline int square_distance(Square s1, Square s2) {
@@ -164,8 +135,8 @@ inline char rank_to_char(Rank r) {
 }
 
 inline const std::string square_to_string(Square s) {
-  return  std::string(1, file_to_char(square_file(s)))
-        + std::string(1, rank_to_char(square_rank(s)));
+  char ch[] = { file_to_char(square_file(s)), rank_to_char(square_rank(s)), 0 };
+  return std::string(ch);
 }
 
 inline bool file_is_ok(File f) {
@@ -177,7 +148,7 @@ inline bool rank_is_ok(Rank r) {
 }
 
 inline bool square_is_ok(Square s) {
-  return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
+  return s >= SQ_A1 && s <= SQ_H8;
 }
 
 #endif // !defined(SQUARE_H_INCLUDED)