X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.h;h=df8797fe1b0b3766ebbdd7c9e5c4b6994247c50e;hp=8150bb0bb6a54d8892fe904a4c0ff347ee79942f;hb=e9ab7353de074a0a970d334ac98b391e2222f77d;hpb=2ef5b4066e649c6ce3b10aa5f1bff7525246646d

diff --git a/src/ucioption.h b/src/ucioption.h
index 8150bb0b..df8797fe 100644
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -20,36 +20,35 @@
 #if !defined(UCIOPTION_H_INCLUDED)
 #define UCIOPTION_H_INCLUDED
 
-#include <cassert>
-#include <cstdlib>
 #include <map>
 #include <string>
 
-struct OptionsMap;
+namespace UCI {
 
-/// UCIOption class implements an option as defined by UCI protocol
-class UCIOption {
+class Option;
 
-  typedef void (Fn)(UCIOption&);
+/// Custom comparator because UCI options should be case insensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
 
-public:
-  UCIOption() {} // Required by std::map::operator[]
-  UCIOption(const char* v, Fn* = NULL);
-  UCIOption(bool v, Fn* = NULL);
-  UCIOption(int v, int min, int max, Fn* = NULL);
+/// Our options container is actually a std::map
+typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
+
+/// Option class implements an option as defined by UCI protocol
+class Option {
 
-  void operator=(const std::string& v);
-  void operator=(bool v) { *this = std::string(v ? "true" : "false"); }
+  typedef void (Fn)(const Option&);
 
-  operator int() const {
-    assert(type == "check" || type == "button" || type == "spin");
-    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
-  }
+public:
+  Option(Fn* = NULL);
+  Option(bool v, Fn* = NULL);
+  Option(const char* v, Fn* = NULL);
+  Option(int v, int min, int max, Fn* = NULL);
 
-  operator std::string() const {
-    assert(type == "string");
-    return currentValue;
-  }
+  Option& operator=(const std::string& v);
+  operator int() const;
+  operator std::string() const;
 
 private:
   friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
@@ -57,22 +56,14 @@ private:
   std::string defaultValue, currentValue, type;
   int min, max;
   size_t idx;
-  Fn* on_change_action;
+  Fn* on_change;
 };
 
+void init(OptionsMap&);
+void loop(const std::string&);
 
-/// Custom comparator because UCI options should be case insensitive
-struct CaseInsensitiveLess {
-  bool operator() (const std::string&, const std::string&) const;
-};
-
-
-/// Our options container is actually a map with a customized c'tor
-struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
-  OptionsMap();
-};
+} // namespace UCI
 
-extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
-extern OptionsMap Options;
+extern UCI::OptionsMap Options;
 
 #endif // !defined(UCIOPTION_H_INCLUDED)