X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.h;h=ae7d392a01d8e52fc4942f18c540a3383f58a30b;hp=50cc100e581a99cec3b644c4b7c76e023f744393;hb=45acec1865f19297d91c6aff0ba64b990ad7d242;hpb=bacb645939397c8f4f070e46093ae764df20e34c

diff --git a/src/ucioption.h b/src/ucioption.h
index 50cc100e..ae7d392a 100644
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -27,8 +27,8 @@
 
 class Option {
 public:
-  Option(); // To allow insertion in a std::map
-  Option(const char* defaultValue, std::string type = "string");
+  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);
 
@@ -37,7 +37,7 @@ public:
 
 private:
   friend void init_uci_options();
-  friend void print_uci_options();
+  friend std::string options_to_uci();
 
   std::string defaultValue, currentValue, type;
   size_t idx;
@@ -47,21 +47,34 @@ private:
 template<typename T>
 inline T Option::value() const {
 
-    assert(type != "UNDEFINED");
-    return T(atoi(currentValue.c_str()));
+  assert(type == "spin");
+  return T(atoi(currentValue.c_str()));
 }
 
 template<>
 inline std::string Option::value<std::string>() const {
 
-    assert(type != "UNDEFINED");
-    return currentValue;
+  assert(type == "string");
+  return currentValue;
 }
 
-typedef std::map<std::string, Option> OptionsMap;
+template<>
+inline bool Option::value<bool>() const {
+
+  assert(type == "check" || type == "button");
+  return currentValue == "true";
+}
+
+
+// Custom comparator because UCI options should not be case sensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
+
+typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
 
 extern OptionsMap Options;
 extern void init_uci_options();
-extern void print_uci_options();
+extern std::string options_to_uci();
 
 #endif // !defined(UCIOPTION_H_INCLUDED)