X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.h;h=c57cf021e8c681ab7c389cac8c5143e53ee97c61;hp=b9c16cd913dab970780fc38f04966f209c388103;hb=673bc5526fa3d352f823ad144fb521b5dc98f45c;hpb=04108d45414c70c796d9378b247207b574e22414

diff --git a/src/ucioption.h b/src/ucioption.h
index b9c16cd9..c57cf021 100644
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,56 +25,53 @@
 #include <map>
 #include <string>
 
-class Option {
-public:
-  Option() {} // To allow insertion in a std::map
-  Option(const char* defaultValue);
-  Option(bool defaultValue, std::string type = "check");
-  Option(int defaultValue, int minValue, int maxValue);
+struct OptionsMap;
 
-  void set_value(const std::string& v);
-  template<typename T> T value() const;
+/// UCIOption class implements an option as defined by UCI protocol
+class UCIOption {
 
-private:
-  friend void init_uci_options();
-  friend std::string options_to_uci();
+  typedef void (Fn)(const UCIOption&);
 
-  std::string defaultValue, currentValue, type;
-  size_t idx;
-  int minValue, maxValue;
-};
-
-template<typename T>
-inline T Option::value() const {
+public:
+  UCIOption(Fn* = NULL);
+  UCIOption(bool v, Fn* = NULL);
+  UCIOption(const char* v, Fn* = NULL);
+  UCIOption(int v, int min, int max, Fn* = NULL);
 
-  assert(type == "spin");
-  return T(atoi(currentValue.c_str()));
-}
+  void operator=(const std::string& v);
 
-template<>
-inline std::string Option::value<std::string>() const {
+  operator int() const {
+    assert(type == "check" || type == "spin");
+    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+  }
 
-  assert(type == "string");
-  return currentValue;
-}
+  operator std::string() const {
+    assert(type == "string");
+    return currentValue;
+  }
 
-template<>
-inline bool Option::value<bool>() const {
+private:
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
-  assert(type == "check" || type == "button");
-  return currentValue == "true";
-}
+  std::string defaultValue, currentValue, type;
+  int min, max;
+  size_t idx;
+  Fn* on_change;
+};
 
 
-// Custom comparator because UCI options should not be case sensitive
+/// Custom comparator because UCI options should be case insensitive
 struct CaseInsensitiveLess {
   bool operator() (const std::string&, const std::string&) const;
 };
 
-typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
 
+/// Our options container is actually a map with a customized c'tor
+struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
+  OptionsMap();
+};
+
+extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
 extern OptionsMap Options;
-extern void init_uci_options();
-extern std::string options_to_uci();
 
 #endif // !defined(UCIOPTION_H_INCLUDED)