Retire struct OptionsMap

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 8150bb0bb6a54d8892fe904a4c0ff347ee79942f..b78bf6fdf4c4108f6edc97b2cfeadb37737f7092 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,24 +25,31 @@
 #include <map>
 #include <string>
 
-struct OptionsMap;
+class UCIOption;
+
+/// 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 std::map
+typedef std::map<std::string, UCIOption, CaseInsensitiveLess> OptionsMap;
 
 /// UCIOption class implements an option as defined by UCI protocol
 class UCIOption {
 
-  typedef void (Fn)(UCIOption&);
+  typedef void (Fn)(const UCIOption&);
 
 public:
-  UCIOption() {} // Required by std::map::operator[]
-  UCIOption(const char* v, Fn* = NULL);
+  UCIOption(Fn* = NULL);
   UCIOption(bool v, Fn* = NULL);
+  UCIOption(const char* v, Fn* = NULL);
   UCIOption(int v, int min, int max, Fn* = NULL);
 
-  void operator=(const std::string& v);
-  void operator=(bool v) { *this = std::string(v ? "true" : "false"); }
+  UCIOption& operator=(const std::string& v);
 
   operator int() const {
-    assert(type == "check" || type == "button" || type == "spin");
+    assert(type == "check" || type == "spin");
     return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
   }
 
@@ -57,22 +64,11 @@ private:
   std::string defaultValue, currentValue, type;
   int min, max;
   size_t idx;
-  Fn* on_change_action;
-};
-
-
-/// Custom comparator because UCI options should be case insensitive
-struct CaseInsensitiveLess {
-  bool operator() (const std::string&, const std::string&) const;
+  Fn* on_change;
 };
 
-
-/// 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;
 
+namespace UCIOptions { void init(OptionsMap&); }
+
 #endif // !defined(UCIOPTION_H_INCLUDED)