X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=2edb4a00452c927468c9d46b7e28aaf1ba947db7;hp=faa55dd662aa8cca6a453e423436ea95bad84fac;hb=5bad5fc0a737b214b2a6b3031e4b92200be012eb;hpb=df4b106716f0fb0a5f5887b1cffeb544174008f7

diff --git a/src/value.h b/src/value.h
index faa55dd6..2edb4a00 100644
--- a/src/value.h
+++ b/src/value.h
@@ -17,25 +17,18 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(VALUE_H_INCLUDED)
 #define VALUE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "piece.h"
+#include <climits>
 
+#include "types.h"
 
-////
-//// Types
-////
 
 enum ValueType {
   VALUE_TYPE_NONE  = 0,
-  VALUE_TYPE_UPPER = 1,  // Upper bound
-  VALUE_TYPE_LOWER = 2,  // Lower bound
+  VALUE_TYPE_UPPER = 1,
+  VALUE_TYPE_LOWER = 2,
   VALUE_TYPE_EXACT = VALUE_TYPE_UPPER | VALUE_TYPE_LOWER
 };
 
@@ -47,10 +40,15 @@ enum Value {
   VALUE_MATE      = 30000,
   VALUE_INFINITE  = 30001,
   VALUE_NONE      = 30002,
-  VALUE_ENSURE_SIGNED = -1
+  VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX,
+  VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN
 };
 
-ENABLE_OPERATORS_ON(Value);
+ENABLE_OPERATORS_ON(Value)
+
+// Extra operators
+inline Value operator+ (Value v, int i) { return Value(int(v) + i); }
+inline Value operator- (Value v, int i) { return Value(int(v) - i); }
 
 
 enum ScaleFactor {
@@ -69,13 +67,10 @@ enum ScaleFactor {
 // its data, so ensure Score to be an integer type.
 enum Score {
     SCORE_ZERO = 0,
-    SCORE_ENSURE_32_BITS_SIZE_P =  (1 << 16),
-    SCORE_ENSURE_32_BITS_SIZE_N = -(1 << 16)
+    SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
+    SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
 };
 
-ENABLE_OPERATORS_ON(Score);
-
-
 // Extracting the _signed_ lower and upper 16 bits it not so trivial
 // because according to the standard a simple cast to short is
 // implementation defined and so is a right shift of a signed integer.
@@ -98,14 +93,16 @@ inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_v
 // a very high risk of overflow. So user should explicitly convert to integer.
 inline Score operator*(Score s1, Score s2);
 
-
-////
-//// Inline functions
-////
-
-inline Value operator+ (Value v, int i) { return Value(int(v) + i); }
-inline Value operator- (Value v, int i) { return Value(int(v) - i); }
-
+// Remaining operators are standard
+inline Score operator+ (const Score d1, const Score d2) { return Score(int(d1) + int(d2)); }
+inline Score operator- (const Score d1, const Score d2) { return Score(int(d1) - int(d2)); }
+inline Score operator* (int i, const Score d) {  return Score(i * int(d)); }
+inline Score operator* (const Score d, int i) {  return Score(int(d) * i); }
+inline Score operator- (const Score d) { return Score(-int(d)); }
+inline void operator+= (Score& d1, const Score d2) { d1 = d1 + d2; }
+inline void operator-= (Score& d1, const Score d2) { d1 = d1 - d2; }
+inline void operator*= (Score& d, int i) { d = Score(int(d) * i); }
+inline void operator/= (Score& d, int i) { d = Score(int(d) / i); }
 
 inline Value value_mate_in(int ply) {
   return VALUE_MATE - ply;