X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fsquare.h;h=e8c693276b051f5a082a58e045269bfe542ac95d;hb=3e20c6c07ddfe2d5f04cf268727ae466e3b36128;hp=c158c89ed74768e328d011aeecd0735d885ad03c;hpb=f56af8e84db25c0d26fe762fbe171ec5518177bb;p=stockfish
diff --git a/src/square.h b/src/square.h
index c158c89e..e8c69327 100644
--- a/src/square.h
+++ b/src/square.h
@@ -1,17 +1,18 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008 Marco Costalba
- Glaurung is free software: you can redistribute it and/or modify
+ 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.
-
- Glaurung is distributed in the hope that it will be useful,
+
+ 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 .
*/
@@ -24,6 +25,7 @@
//// Includes
////
+#include // for abs()
#include
#include "color.h"
@@ -44,7 +46,7 @@ enum Square {
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
@@ -71,7 +73,7 @@ const int FlipMask = 070;
const int FlopMask = 07;
-////
+////
//// Inline functions
////
@@ -157,21 +159,43 @@ inline int square_distance(Square s1, Square s2) {
return Max(file_distance(s1, s2), rank_distance(s1, s2));
}
+inline File file_from_char(char c) {
+ return File(c - 'a') + FILE_A;
+}
-////
-//// Prototypes
-////
+inline int file_to_char(File f) {
+ return int(f - FILE_A) + 'a';
+}
+
+inline Rank rank_from_char(char c) {
+ return Rank(c - '1') + RANK_1;
+}
-extern File file_from_char(char c);
-extern char file_to_char(File f);
-extern Rank rank_from_char(char c);
-extern char rank_to_char(Rank r);
-extern Square square_from_string(const std::string &str);
-extern const std::string square_to_string(Square s);
+inline int rank_to_char(Rank r) {
+ return int(r - RANK_1) + '1';
+}
-extern bool file_is_ok(File f);
-extern bool rank_is_ok(Rank r);
-extern bool square_is_ok(Square s);
+inline Square square_from_string(const std::string& str) {
+ return make_square(file_from_char(str[0]), rank_from_char(str[1]));
+}
+inline const std::string square_to_string(Square s) {
+ std::string str;
+ str += file_to_char(square_file(s));
+ str += rank_to_char(square_rank(s));
+ return str;
+}
+
+inline bool file_is_ok(File f) {
+ return f >= FILE_A && f <= FILE_H;
+}
+
+inline bool rank_is_ok(Rank r) {
+ return r >= RANK_1 && r <= RANK_8;
+}
+
+inline bool square_is_ok(Square s) {
+ return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
+}
#endif // !defined(SQUARE_H_INCLUDED)