Assorted nitpicking code-style

[stockfish] / src / misc.h

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