Move all enum types definitions to types.h

Cleanup headers while there. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
mcostalba · Feb 23, 2011 · 0fcda09 · 0fcda09
1 parent 9521222
commit 0fcda09
Show file tree

Hide file tree

Showing 28 changed files with 319 additions and 608 deletions.
diff --git a/src/bitbase.cpp b/src/bitbase.cpp
@@ -17,20 +17,10 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <cassert>
 
 #include "bitboard.h"
-#include "square.h"
-
-
-////
-//// Local definitions
-////
+#include "types.h"
 
 namespace {
 
@@ -63,10 +53,6 @@ namespace {
 }
 
 
-////
-//// Functions
-////
-
 void generate_kpk_bitbase(uint8_t bitbase[]) {
 
   bool repeat;

diff --git a/src/bitboard.h b/src/bitboard.h
@@ -21,8 +21,6 @@
 #if !defined(BITBOARD_H_INCLUDED)
 #define BITBOARD_H_INCLUDED
 
-#include "piece.h"
-#include "square.h"
 #include "types.h"
 
 const Bitboard EmptyBoardBB = 0;

diff --git a/src/bitcount.h b/src/bitcount.h
@@ -18,7 +18,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(BITCOUNT_H_INCLUDED)
 #define BITCOUNT_H_INCLUDED
 

diff --git a/src/depth.h b/src/depth.h
diff --git a/src/endgame.h b/src/endgame.h
@@ -17,21 +17,11 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(ENDGAME_H_INCLUDED)
 #define ENDGAME_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include "position.h"
-#include "value.h"
-
-
-////
-//// Types
-////
+#include "types.h"
 
 enum EndgameType {
 
@@ -94,11 +84,4 @@ struct ScalingFunction : public EndgameScalingFunctionBase {
   ScaleFactor apply(const Position&) const;
 };
 
-
-////
-//// Prototypes
-////
-
-extern void init_bitbases();
-
 #endif // !defined(ENDGAME_H_INCLUDED)
diff --git a/src/evaluate.h b/src/evaluate.h
@@ -17,12 +17,10 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(EVALUATE_H_INCLUDED)
 #define EVALUATE_H_INCLUDED
 
-#include "piece.h"
-#include "value.h"
+#include "types.h"
 
 class Position;
 

diff --git a/src/history.h b/src/history.h
@@ -21,12 +21,7 @@
 #define HISTORY_H_INCLUDED
 
 #include <cstring>
-
-#include "depth.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
-
+#include "types.h"
 
 /// The History class stores statistics about how often different moves
 /// have been successful or unsuccessful during the current search. These

diff --git a/src/lock.h b/src/lock.h
@@ -17,11 +17,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(LOCK_H_INCLUDED)
 #define LOCK_H_INCLUDED
 
-
 #if !defined(_MSC_VER)
 
 #  include <pthread.h>

diff --git a/src/main.cpp b/src/main.cpp
@@ -20,23 +20,13 @@
 // To profile with callgrind uncomment following line
 //#define USE_CALLGRIND
 
-
-////
-//// Includes
-////
-
 #include <cstdio>
 #include <iostream>
 #include <string>
 
 #include "bitboard.h"
-#include "bitcount.h"
-#include "endgame.h"
 #include "evaluate.h"
-#include "material.h"
-#include "misc.h"
 #include "position.h"
-#include "search.h"
 #include "thread.h"
 #include "ucioption.h"
 
@@ -48,10 +38,7 @@ using namespace std;
 
 extern bool execute_uci_command(const string& cmd);
 extern void benchmark(int argc, char* argv[]);
-
-////
-//// Functions
-////
+extern void init_bitbases();
 
 int main(int argc, char* argv[]) {
 

diff --git a/src/material.h b/src/material.h
@@ -17,23 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MATERIAL_H_INCLUDED)
 #define MATERIAL_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include "endgame.h"
 #include "position.h"
 #include "tt.h"
 
-
-////
-//// Types
-////
-
 const int MaterialTableSize = 1024;
 
 /// MaterialInfo is a class which contains various information about a
@@ -83,11 +73,6 @@ class MaterialInfoTable : public SimpleHash<MaterialInfo, MaterialTableSize> {
 };
 
 
-////
-//// Inline functions
-////
-
-
 /// MaterialInfo::material_value simply returns the material balance
 /// evaluation that is independent from game phase.
 
@@ -96,6 +81,7 @@ inline Score MaterialInfo::material_value() const {
   return make_score(value, value);
 }
 
+
 /// MaterialInfo::scale_factor takes a position and a color as input, and
 /// returns a scale factor for the given color. We have to provide the
 /// position in addition to the color, because the scale factor need not
@@ -123,6 +109,7 @@ inline int MaterialInfo::space_weight() const {
   return spaceWeight;
 }
 
+
 /// MaterialInfo::game_phase() returns the game phase according
 /// to this material configuration.
 

diff --git a/src/misc.h b/src/misc.h
@@ -21,7 +21,6 @@
 #define MISC_H_INCLUDED
 
 #include <string>
-
 #include "types.h"
 
 extern const std::string engine_name();

diff --git a/src/move.h b/src/move.h
@@ -23,9 +23,7 @@
 #include <string>
 
 #include "misc.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
+#include "types.h"
 
 // Maximum number of allowed moves per position
 const int MOVES_MAX = 256;

diff --git a/src/movegen.cpp b/src/movegen.cpp
@@ -17,16 +17,10 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <cassert>
 
 #include "bitcount.h"
 #include "movegen.h"
-#include "types.h"
 
 // Simple macro to wrap a very common while loop, no facny, no flexibility,
 // hardcoded list name 'mlist' and from square 'from'.
@@ -35,10 +29,6 @@
 // Version used for pawns, where the 'from' square is given as a delta from the 'to' square
 #define SERIALIZE_MOVES_D(b, d) while (b) { to = pop_1st_bit(&b); (*mlist++).move = make_move(to + (d), to); }
 
-////
-//// Local definitions
-////
-
 namespace {
 
   enum CastlingSide {

diff --git a/src/movegen.h b/src/movegen.h
@@ -17,7 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MOVEGEN_H_INCLUDED)
 #define MOVEGEN_H_INCLUDED
 

diff --git a/src/movepick.cpp b/src/movepick.cpp
@@ -24,7 +24,7 @@
 #include "movegen.h"
 #include "movepick.h"
 #include "search.h"
-#include "value.h"
+#include "types.h"
 
 namespace {
 

diff --git a/src/movepick.h b/src/movepick.h
@@ -20,9 +20,9 @@
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-#include "depth.h"
 #include "history.h"
 #include "position.h"
+#include "types.h"
 
 struct SearchStack;
 

diff --git a/src/pawns.h b/src/pawns.h
@@ -17,23 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(PAWNS_H_INCLUDED)
 #define PAWNS_H_INCLUDED
 
-////
-//// Includes
-////
-
 #include "bitboard.h"
 #include "position.h"
 #include "tt.h"
-#include "value.h"
-
-
-////
-//// Types
-////
+#include "types.h"
 
 const int PawnTableSize = 16384;
 
@@ -88,11 +78,6 @@ class PawnInfoTable : public SimpleHash<PawnInfo, PawnTableSize> {
   Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const;
 };
 
-
-////
-//// Inline functions
-////
-
 inline Square pawn_push(Color c) {
   return c == WHITE ? DELTA_N : DELTA_S;
 }