Assorted nitpicking code-style

No functional change.

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index ba9680a90e529d62ef805893d9ee1862bc7eedb8..64de5d6dfdb4c979f7a2326819ef2bb440346808 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -67,13 +67,15 @@ const char* Defaults[] = {
   "8/3p3B/5p2/5P2/p7/PP5b/k7/6K1 w - - 0 1",
 
   // 5-man positions
-  "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1", // Kc2 - mate
-  "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1", // Na2 - mate
-  "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1", // draw
+  "8/8/8/8/5kp1/P7/8/1K1N4 w - - 0 1",     // Kc2 - mate
+  "8/8/8/5N2/8/p7/8/2NK3k w - - 0 1",      // Na2 - mate
+  "8/3k4/8/8/8/4B3/4KB2/2B5 w - - 0 1",    // draw
+
   // 6-man positions
-  "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1", // Re5 - mate
-  "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1", // Ka2 - mate
-  "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1", // Nd2 - draw
+  "8/8/1P6/5pr1/8/4R3/7k/2K5 w - - 0 1",   // Re5 - mate
+  "8/2p4P/8/kr6/6R1/8/8/1K6 w - - 0 1",    // Ka2 - mate
+  "8/8/3P3k/8/1p6/8/1P6/1K3n2 b - - 0 1",  // Nd2 - draw
+
   // 7-man positions
   "8/R7/2q5/8/6k1/8/1P5p/K6R w - - 0 124", // Draw
 };

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index dbaeb701cff9e6e29fc732895a71fda4408bc99e..edadb8e3cf057c2e54e8e29f1a838a5637141a66 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -252,6 +252,7 @@ namespace {
 
     int seeds[][RANK_NB] = { { 8977, 44560, 54343, 38998,  5731, 95205, 104912, 17020 },
                              {  728, 10316, 55013, 32803, 12281, 15100,  16645,   255 } };
+
     Bitboard occupancy[4096], reference[4096], edges, b;
     int i, size;
 

diff --git a/src/misc.h b/src/misc.h
index b9277372aa4ac224dd2c4baf68aebfceef64d711..1e4c91c571cf6e9414641ae9c2449aa07161618c 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -20,6 +20,7 @@
 #ifndef MISC_H_INCLUDED
 #define MISC_H_INCLUDED
 
+#include <cassert>
 #include <ostream>
 #include <string>
 #include <vector>
@@ -64,32 +65,36 @@ std::ostream& operator<<(std::ostream&, SyncCout);
 /// This class is based on original code written and dedicated
 /// to the public domain by Sebastiano Vigna (2014).
 /// It has the following characteristics:
+///
 ///  -  Outputs 64-bit numbers
 ///  -  Passes Dieharder and SmallCrush test batteries
 ///  -  Does not require warm-up, no zeroland to escape
 ///  -  Internal state is a single 64-bit integer
 ///  -  Period is 2^64 - 1
 ///  -  Speed: 1.60 ns/call (Core i7 @3.40GHz)
+///
 /// For further analysis see
 ///   <http://vigna.di.unimi.it/ftp/papers/xorshift.pdf>
 
 class PRNG {
 
-  uint64_t x;
+  uint64_t s;
 
   uint64_t rand64() {
-    x^=x>>12; x^=x<<25; x^=x>>27;
-    return x * 2685821657736338717LL;
+
+    s ^= s >> 12, s ^= s << 25, s ^= s >> 27;
+    return s * 2685821657736338717LL;
   }
 
 public:
-  PRNG(uint64_t seed) : x(seed) { assert(seed); }
+  PRNG(uint64_t seed) : s(seed) { assert(seed); }
 
   template<typename T> T rand() { return T(rand64()); }
 
   /// Special generator used to fast init magic numbers.
   /// Output values only have 1/8th of their bits set on average.
-  template<typename T> T sparse_rand() { return T(rand64() & rand64() & rand64()); }
+  template<typename T> T sparse_rand()
+  { return T(rand64() & rand64() & rand64()); }
 };
 
 #endif // #ifndef MISC_H_INCLUDED

diff --git a/src/position.cpp b/src/position.cpp
index a41dd52b66777aad041bfbd3bb914be8ff6c2f30..5f5bb5a6a0e1111a255b872c71c4d0409157f84a 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -24,10 +24,10 @@
 #include <sstream>
 
 #include "bitcount.h"
+#include "misc.h"
 #include "movegen.h"
 #include "position.h"
 #include "psqtab.h"
-#include "misc.h"
 #include "thread.h"
 #include "tt.h"
 #include "uci.h"

diff --git a/src/search.cpp b/src/search.cpp
index f15c572ee79824dd948c29b81e6a9060d8a1a211..135f7808d1778768a4e5d3dd0737373e9010745b 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -25,9 +25,9 @@
 #include <sstream>
 
 #include "evaluate.h"
+#include "misc.h"
 #include "movegen.h"
 #include "movepick.h"
-#include "misc.h"
 #include "search.h"
 #include "timeman.h"
 #include "thread.h"